From: Lyberta <lyberta@lyberta.net>
Date: Thu, 1 Jun 2017 13:09:53 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
X-Git-Tag: xonotic-v0.8.5~2119^2~68
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8a336668045070d910c34b62f80a16c2042a1a7b;p=xonotic%2Fxonotic-data.pk3dir.git

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

8a336668045070d910c34b62f80a16c2042a1a7b