From: Mirio <opivy@hotmail.de>
Date: Thu, 27 Nov 2014 00:11:33 +0000 (+0100)
Subject: Merge branch 'Mirio/implosion' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3di... 
X-Git-Tag: xonotic-v0.8.0~15^2~1
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=470eacc10c95190a843191e9d3b329349c2b17f6;hp=-c

Merge branch 'Mirio/implosion' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir into mirio/implosion
---

470eacc10c95190a843191e9d3b329349c2b17f6