From: Rudolf Polzer Date: Sat, 3 Sep 2011 08:44:12 +0000 (+0200) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir X-Git-Tag: xonotic-v0.5.0~20 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f2a86842de4846250ecbf7414f6f09c578ab6cba;p=xonotic%2Fxonotic-maps.pk3dir.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir --- f2a86842de4846250ecbf7414f6f09c578ab6cba