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

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

17e6aea77650cc8140caf8148ae343418cc8d87c