Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Fri, 13 Jan 2012 19:54:42 +0000 (20:54 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 13 Jan 2012 19:54:42 +0000 (20:54 +0100)

Trivial merge