From: Mirio <opivy@hotmail.de>
Date: Mon, 9 Feb 2015 23:21:59 +0000 (+0100)
Subject: Merge branch 'Mirio/mapfixes'
X-Git-Tag: xonotic-v0.8.1~40
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8663fcd3effb3b6874eb96cf1e773597b63448ca;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'Mirio/mapfixes'
---

8663fcd3effb3b6874eb96cf1e773597b63448ca