Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Sun, 2 Oct 2011 18:48:34 +0000 (20:48 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sun, 2 Oct 2011 18:48:34 +0000 (20:48 +0200)

Trivial merge