From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 26 Jan 2011 07:53:18 +0000 (+0100)
Subject: Merge remote branch 'origin/tzork/glowplant'
X-Git-Tag: xonotic-v0.5.0~117
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0f337c6f15e811b77a0009704aa0c1dfb024357b;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote branch 'origin/tzork/glowplant'

Conflicts:
	maps/glowplant.map (taking over tZork's new versions, throwing away in between changes on master)
---

0f337c6f15e811b77a0009704aa0c1dfb024357b