From: Lyberta <lyberta@lyberta.net>
Date: Fri, 27 Apr 2018 09:19:05 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/GunGame
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2ebd6368ddb2c18dee6195824033f8916fc983af;p=xonotic%2Fxonotic-data.pk3dir.git

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

2ebd6368ddb2c18dee6195824033f8916fc983af