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

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

836465e9876488043b07df9585b25f45c368eaa5