From: Lyberta <lyberta@lyberta.net>
Date: Wed, 4 Apr 2018 16:50:11 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
X-Git-Tag: xonotic-v0.8.5~2119^2~16
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f41f81f37e3ecf5a2d14f7bc7ffd7bbf09fff32e;p=xonotic%2Fxonotic-data.pk3dir.git

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

f41f81f37e3ecf5a2d14f7bc7ffd7bbf09fff32e