From: Rudolf Polzer <divVerent@xonotic.org>
Date: Mon, 15 Nov 2010 10:53:41 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/mapinfo_improvements'
X-Git-Tag: xonotic-v0.1.0preview~33
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b271a2e7187930fa2f0b93372d2622e95180257e;p=xonotic%2Fxonotic-maps.pk3dir.git

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

b271a2e7187930fa2f0b93372d2622e95180257e