From: Mirio <opivy@hotmail.de>
Date: Thu, 12 Feb 2015 10:32:48 +0000 (+0100)
Subject: Merge branch 'Mirio/glowplant'
X-Git-Tag: xonotic-v0.8.1~27
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=ceb493df9c56577a009e7ba7486f3f661e5bb276;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'Mirio/glowplant'
---

ceb493df9c56577a009e7ba7486f3f661e5bb276