From: Mirio <opivy@hotmail.de>
Date: Wed, 9 Mar 2016 17:12:20 +0000 (+0100)
Subject: Merge branch 'master' into mirio/crystalcave
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=36bac7f957efe041d5a04d6f3b5a846629a05a0f;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into mirio/crystalcave
---

36bac7f957efe041d5a04d6f3b5a846629a05a0f