From: Mirio <opivy@hotmail.de>
Date: Tue, 25 Oct 2016 23:23:06 +0000 (+0200)
Subject: Merge branch 'master' into tzork/map-mojoctf
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ad0e5f9dfd4f604ca54ef50cd0cbf65a30f2d3d8;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into tzork/map-mojoctf
---

ad0e5f9dfd4f604ca54ef50cd0cbf65a30f2d3d8