From: Mario <zacjardine@y7mail.com>
Date: Tue, 2 Dec 2014 02:31:42 +0000 (+1100)
Subject: Merge branch 'master' into Mirio/implosion
X-Git-Tag: xonotic-v0.8.0~15^2
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=c76383b26842da8523c484468062933d1b818be6;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into Mirio/implosion
---

c76383b26842da8523c484468062933d1b818be6