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

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

a05e216d81dd650e449bee5f717c52c4d0ecce55