From: Lyberta <lyberta@lyberta.net>
Date: Tue, 29 Aug 2017 00:46:57 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
X-Git-Tag: xonotic-v0.8.5~2119^2~56
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6ea97246f03651c514be506bf57cbc0c2351e935;p=xonotic%2Fxonotic-data.pk3dir.git

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

6ea97246f03651c514be506bf57cbc0c2351e935