Merge branch 'Mirio/darkzone' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir...
authorMirio <opivy@hotmail.de>
Wed, 28 Oct 2015 08:35:57 +0000 (09:35 +0100)
committerMirio <opivy@hotmail.de>
Wed, 28 Oct 2015 08:35:57 +0000 (09:35 +0100)

Trivial merge