From: Mirio <opivy@hotmail.de>
Date: Tue, 25 Oct 2016 22:40:05 +0000 (+0200)
Subject: Merge branch 'master' into amade/sewers
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2Famade%2Fsewers;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into amade/sewers
---

3d3b36f6fc5086963371ac398850a9c24bc068a3