From: Jakob MG <jakob_mg@hotmail.com>
Date: Sun, 13 Mar 2011 22:03:52 +0000 (+0100)
Subject: Merge commit 'a5f8cbe456bed48c2c7b5d666e30cbaa344e6e33'
X-Git-Tag: xonotic-v0.5.0~309^2~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e485fd25f90166cbd4a258456a7bd66540536608;p=xonotic%2Fxonotic-data.pk3dir.git

Merge commit 'a5f8cbe456bed48c2c7b5d666e30cbaa344e6e33'
---

e485fd25f90166cbd4a258456a7bd66540536608