From: cbrutail <ruszkai.akos@gmail.com>
Date: Thu, 19 Sep 2013 11:26:47 +0000 (+0200)
Subject: Merge branch 'cbrutail/mapmodels-glowyplants' into cbrutail/map-forxtron
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6c7680de2cf87b3080d6091c522423cfccfd9e79;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'cbrutail/mapmodels-glowyplants' into cbrutail/map-forxtron

Merging glowyplants
---

6c7680de2cf87b3080d6091c522423cfccfd9e79