From: Lyberta <lyberta@lyberta.net>
Date: Wed, 4 Apr 2018 16:41:35 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/GunGame
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3d8cfa024224031606f03102a4e521a23cd26d94;p=xonotic%2Fxonotic-data.pk3dir.git

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

3d8cfa024224031606f03102a4e521a23cd26d94