From: Mirio <opivy@hotmail.de>
Date: Sat, 22 Jul 2017 14:30:26 +0000 (+0200)
Subject: Merge branch 'master' into Mirio/crystalcave
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2FMirio%2Fcrystalcave;p=xonotic%2Fxonotic-maps.pk3dir.git

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

97f2db9cd002d24156b817bb9a273ce484f94d04