From: Rudolf Polzer Date: Tue, 30 Aug 2011 07:43:50 +0000 (+0200) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic X-Git-Tag: xonotic-v0.5.0~15 X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=b172ea517999552dffb2bcae2f011c8ad477c029 Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic --- b172ea517999552dffb2bcae2f011c8ad477c029