From: Rudolf Polzer <divVerent@xonotic.org>
Date: Thu, 21 Oct 2010 16:29:50 +0000 (+0200)
Subject: Merge remote branch 'origin/fruitiex/glowplant'
X-Git-Tag: xonotic-v0.1.0preview~92
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=31860279d0c912ff5c238ae008cc4eebd96456b2;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote branch 'origin/fruitiex/glowplant'
---

31860279d0c912ff5c238ae008cc4eebd96456b2