From: Lyberta <lyberta@lyberta.net>
Date: Fri, 1 Sep 2017 11:30:40 +0000 (+0300)
Subject: Merge branch 'Lyberta/GunGame' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6ad842d9276dd3fa88096057d63a9db3b0738baf;p=xonotic%2Fxonotic-data.pk3dir.git

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

6ad842d9276dd3fa88096057d63a9db3b0738baf