Merge branch 'Mirio/implosion' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3di...
authorMirio <opivy@hotmail.de>
Thu, 27 Nov 2014 00:11:33 +0000 (01:11 +0100)
committerMirio <opivy@hotmail.de>
Thu, 27 Nov 2014 00:11:33 +0000 (01:11 +0100)

Trivial merge