From: Rudolf Polzer Date: Sun, 29 Jan 2012 10:41:12 +0000 (+0100) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic X-Git-Tag: xonotic-v0.6.0~30^2~3 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e88d8f2e24d19ecc83dd9393b7162e54bd3a1603;p=xonotic%2Fxonotic.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic --- e88d8f2e24d19ecc83dd9393b7162e54bd3a1603