From: Lyberta <lyberta@lyberta.net>
Date: Wed, 5 Jul 2017 23:13:59 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
X-Git-Tag: xonotic-v0.8.5~2119^2~64
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=1a463f974e1c026a16a76dd042ebccb1085ad985;hp=--cc;p=xonotic%2Fxonotic-data.pk3dir.git

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

1a463f974e1c026a16a76dd042ebccb1085ad985