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

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

8bc28937bd6cfd9b20587ad96f5b9ce490ef3a09