From: Lyberta <lyberta@lyberta.net>
Date: Sat, 2 Dec 2017 15:54:27 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/GunGame
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7e7fedc8c00e9b0f2cba7ec0049aaa82d6fc97db;p=xonotic%2Fxonotic-data.pk3dir.git

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

7e7fedc8c00e9b0f2cba7ec0049aaa82d6fc97db