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

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

60019c9fb1bf3b566703615b35533d4d0c5e272a