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

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

76cb07e29ebf458c5010ed0b3f7848246be018e0