From: Lyberta <lyberta@lyberta.net>
Date: Mon, 8 Jan 2018 16:11:59 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/GunGame
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f960b27ca985c17cc085780b4e953547b903123f;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into Lyberta/GunGame
---

f960b27ca985c17cc085780b4e953547b903123f