From: Rudolf Polzer Date: Tue, 13 Sep 2011 07:45:10 +0000 (+0200) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir X-Git-Tag: xonotic-v0.6.0~74^2~14 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=a7a6be1fa5502597dce2fbbfd7ac47b006dfbded Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir --- a7a6be1fa5502597dce2fbbfd7ac47b006dfbded