From: Mario <zacjardine@y7mail.com>
Date: Tue, 2 Dec 2014 02:32:00 +0000 (+1100)
Subject: Merge branch 'Mirio/implosion'
X-Git-Tag: xonotic-v0.8.0~15
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e7be9a0b0b05227c369c1d9ae68741b265135aa3;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'Mirio/implosion'
---

e7be9a0b0b05227c369c1d9ae68741b265135aa3