From: Rudolf Polzer Date: Mon, 24 Sep 2012 11:45:14 +0000 (+0200) Subject: Merge branch 'master' of http://de.git.xonotic.org/xonotic/xonotic X-Git-Tag: xonotic-v0.7.0~37 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1e6fef74b8e7d575fb09e882f7506a592cacc5f0;p=xonotic%2Fxonotic.git Merge branch 'master' of http://de.git.xonotic.org/xonotic/xonotic --- 1e6fef74b8e7d575fb09e882f7506a592cacc5f0