From: Rudolf Polzer Date: Fri, 6 Aug 2010 06:36:35 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic X-Git-Tag: xonotic-v0.1.0preview~325^2 X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=977e573f2ff7619d137657bab4fb08ac743202c1 Merge branch 'master' of ssh://git.xonotic.org/xonotic --- 977e573f2ff7619d137657bab4fb08ac743202c1