From: Rudolf Polzer Date: Sat, 27 Aug 2011 20:38:11 +0000 (+0200) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic X-Git-Tag: xonotic-v0.5.0~18 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d08c026aecb1312c1169fdbe7314ccd8d490414a;p=xonotic%2Fxonotic.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic --- d08c026aecb1312c1169fdbe7314ccd8d490414a