From: Mirio <opivy@hotmail.de>
Date: Tue, 18 Nov 2014 15:50:58 +0000 (+0100)
Subject: Merge branch 'master' into mirio/implosion
X-Git-Tag: xonotic-v0.8.0~15^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3ee6bcd6a40be04dff24eee39d37b9f0f3094561;p=xonotic%2Fxonotic-maps.pk3dir.git

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

3ee6bcd6a40be04dff24eee39d37b9f0f3094561