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

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

56f236eb6d15377f92cab55ff6799f54eb9260c1