Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Thu, 4 Aug 2011 17:37:54 +0000 (19:37 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 4 Aug 2011 17:37:54 +0000 (19:37 +0200)

Trivial merge