Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Sun, 14 Aug 2011 14:59:07 +0000 (16:59 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sun, 14 Aug 2011 14:59:07 +0000 (16:59 +0200)

Trivial merge