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

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

0112f175bab4b4689ca9c2978c0333b07d0d94e6