Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Mon, 1 Nov 2010 14:25:47 +0000 (15:25 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 1 Nov 2010 14:25:47 +0000 (15:25 +0100)

Trivial merge