From: Lyberta <lyberta@lyberta.net>
Date: Mon, 5 Feb 2018 17:08:43 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
X-Git-Tag: xonotic-v0.8.5~2119^2~42
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=820589b53e6802eb4c5ea563bb58d48c4f4aa9e1;p=xonotic%2Fxonotic-data.pk3dir.git

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

820589b53e6802eb4c5ea563bb58d48c4f4aa9e1