From: Rudolf Polzer Date: Thu, 5 Jan 2012 09:15:10 +0000 (+0100) Subject: Merge branch 'master' into cbrutail/darkzone X-Git-Tag: xonotic-v0.6.0~5^2~16 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c0fe9496ecb181054f4b051480aad05bb78b1a65;p=xonotic%2Fxonotic-maps.pk3dir.git Merge branch 'master' into cbrutail/darkzone --- c0fe9496ecb181054f4b051480aad05bb78b1a65