From: Rudolf Polzer Date: Wed, 29 Feb 2012 11:32:42 +0000 (+0100) Subject: Merge branch 'master' of /var/cache/git/xonotic/xonotic X-Git-Tag: xonotic-v0.6.0~11^2 X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=af076b8bdfbf3143f9fbad13a04b039c0ce38473 Merge branch 'master' of /var/cache/git/xonotic/xonotic --- af076b8bdfbf3143f9fbad13a04b039c0ce38473