Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Fri, 6 Aug 2010 20:24:04 +0000 (22:24 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 6 Aug 2010 20:24:04 +0000 (22:24 +0200)

Trivial merge