Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Sun, 12 Sep 2010 14:33:39 +0000 (16:33 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 12 Sep 2010 14:33:39 +0000 (16:33 +0200)

Trivial merge