From: Rudolf Polzer <divverent@alientrap.org>
Date: Sun, 14 Nov 2010 16:17:52 +0000 (+0100)
Subject: Merge remote branch 'origin/tzork/glowplant'
X-Git-Tag: xonotic-v0.1.0preview~37
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=a25a5fb7b6d709c6e8ace1b4609bbba788129360;p=xonotic%2Fxonotic-maps.pk3dir.git

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

a25a5fb7b6d709c6e8ace1b4609bbba788129360