From: Lyberta <lyberta@lyberta.net>
Date: Wed, 22 Aug 2018 10:33:56 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/GunGame
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a84ccd8d47f909961062c76a3c442bf300b0a5ac;p=xonotic%2Fxonotic-data.pk3dir.git

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

a84ccd8d47f909961062c76a3c442bf300b0a5ac