From: Mirio <opivy@hotmail.de>
Date: Wed, 20 Jan 2016 08:54:45 +0000 (+0100)
Subject: Merge branch 'master' into amade/sewers
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6c8126d079670b47bda2b800039117d6ca75e425;p=xonotic%2Fxonotic-maps.pk3dir.git

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

6c8126d079670b47bda2b800039117d6ca75e425