From: FruitieX <rasse@rasse-laptop.(none)>
Date: Thu, 21 Oct 2010 16:26:54 +0000 (+0300)
Subject: Merge branch 'master' into fruitiex/glowplant
X-Git-Tag: xonotic-v0.1.0preview~92^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0e12e823def3594e791e596feac1e4a5863b421b;p=xonotic%2Fxonotic-maps.pk3dir.git

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

0e12e823def3594e791e596feac1e4a5863b421b