Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir
authorRudolf Polzer <divVerent@xonotic.org>
Tue, 13 Sep 2011 07:45:10 +0000 (09:45 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Tue, 13 Sep 2011 07:45:10 +0000 (09:45 +0200)

Trivial merge