Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir
authorMirio <opivy@hotmail.de>
Sun, 12 Mar 2017 21:57:20 +0000 (22:57 +0100)
committerMirio <opivy@hotmail.de>
Sun, 12 Mar 2017 21:57:20 +0000 (22:57 +0100)

Trivial merge