From: Lyberta <lyberta@lyberta.net>
Date: Sun, 10 Sep 2017 23:39:05 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/GunGame
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9375ab1bfa3448dca1fbc43c45bc9e1f109fe83a;p=xonotic%2Fxonotic-data.pk3dir.git

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

9375ab1bfa3448dca1fbc43c45bc9e1f109fe83a