From: Lyberta <lyberta@lyberta.net>
Date: Mon, 13 Mar 2017 11:49:01 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
X-Git-Tag: xonotic-v0.8.5~2119^2~85
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=93828285050f4c7c88bec2a5aa12da41538e5075;p=xonotic%2Fxonotic-data.pk3dir.git

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

93828285050f4c7c88bec2a5aa12da41538e5075