Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Tue, 8 Jun 2010 10:03:28 +0000 (12:03 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 8 Jun 2010 10:03:28 +0000 (12:03 +0200)

Trivial merge