From: Rudolf Polzer Date: Sat, 13 Aug 2011 06:22:32 +0000 (+0200) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir X-Git-Tag: xonotic-v0.5.0~59 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=16527236b31e1d62685be86f06a02763caaab31a Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir --- 16527236b31e1d62685be86f06a02763caaab31a