From: Rudolf Polzer Date: Fri, 30 Dec 2011 14:34:33 +0000 (+0100) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir X-Git-Tag: xonotic-v0.6.0~37 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=84647dd93e42da010a955727b1665770eae8dba2;p=xonotic%2Fxonotic-maps.pk3dir.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir --- 84647dd93e42da010a955727b1665770eae8dba2