From: Rudolf Polzer Date: Fri, 16 Sep 2011 22:48:50 +0000 (+0200) Subject: Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic X-Git-Tag: xonotic-v0.6.0~99 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=724b608a7c7c5423293c04c1b777e4630b4e628d;p=xonotic%2Fxonotic.git Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic --- 724b608a7c7c5423293c04c1b777e4630b4e628d