From: Rudolf Polzer Date: Fri, 27 May 2011 18:33:02 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/samual/intermission_fixes' X-Git-Tag: xonotic-v0.5.0~215^2~12 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=89c401d11e2ccee1a2164caf451fc3fbb27d429d;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/samual/intermission_fixes' --- 89c401d11e2ccee1a2164caf451fc3fbb27d429d