From: Mirio <opivy@hotmail.de>
Date: Fri, 23 Jan 2015 19:10:45 +0000 (+0100)
Subject: Merge branch 'master' into mirio/glowplant
X-Git-Tag: xonotic-v0.8.1~27^2~4
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=77445248ff6c3e6996b4307afb8008c9c137bc95

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

77445248ff6c3e6996b4307afb8008c9c137bc95