From: Rudolf Polzer Date: Mon, 26 Dec 2011 15:52:14 +0000 (+0100) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir X-Git-Tag: xonotic-v0.6.0~40^2~11^2 X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=32e16889b1b89f22435e082e4fb570ff68e9121f Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir --- 32e16889b1b89f22435e082e4fb570ff68e9121f