From: Rudolf Polzer Date: Sun, 21 Nov 2010 19:38:04 +0000 (+0100) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic X-Git-Tag: xonotic-v0.1.0preview~36 X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=bdc9d82566d9ec5ad934c2ddcf32244e3aee02e3 Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic --- bdc9d82566d9ec5ad934c2ddcf32244e3aee02e3