From: Lyberta <lyberta@lyberta.net>
Date: Thu, 22 Feb 2018 03:37:37 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/GunGame
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7654ca8a65b9e184e571f45092750fdb1ab7dabb;p=xonotic%2Fxonotic-data.pk3dir.git

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

7654ca8a65b9e184e571f45092750fdb1ab7dabb