From: Mirio <opivy@hotmail.de>
Date: Thu, 19 Jun 2014 01:21:34 +0000 (+0200)
Subject: Merge branch 'master' into mirio/glowplant
X-Git-Tag: xonotic-v0.8.1~27^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3e918cbef1a0376b716884ad880c9e3564dc9fe4;p=xonotic%2Fxonotic-maps.pk3dir.git

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

3e918cbef1a0376b716884ad880c9e3564dc9fe4