From: Rudolf Polzer Date: Mon, 14 Mar 2011 07:11:31 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/samual/fixes_for_latest_merge' X-Git-Tag: xonotic-v0.5.0~309^2~4^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=05b7ffd549fa1405f759ba519a96fe0646c075bd;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/samual/fixes_for_latest_merge' --- 05b7ffd549fa1405f759ba519a96fe0646c075bd