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

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

74a1b06132c73e7376fdc66dd26bbbbc277ea8db