Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Tue, 5 Oct 2010 18:52:07 +0000 (20:52 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 5 Oct 2010 18:52:07 +0000 (20:52 +0200)

Trivial merge