Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir
authorRudolf Polzer <divVerent@xonotic.org>
Sat, 13 Aug 2011 06:22:32 +0000 (08:22 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Sat, 13 Aug 2011 06:22:32 +0000 (08:22 +0200)

Trivial merge