From: Lyberta <lyberta@lyberta.net>
Date: Wed, 6 Sep 2017 11:46:20 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/GunGame
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c8a47d55a493edce0ebb8c72386ee623613dcd45;p=xonotic%2Fxonotic-data.pk3dir.git

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

c8a47d55a493edce0ebb8c72386ee623613dcd45