Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Thu, 15 Jul 2010 15:29:00 +0000 (17:29 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 15 Jul 2010 15:29:00 +0000 (17:29 +0200)

Trivial merge