From: Lyberta <lyberta@lyberta.net>
Date: Wed, 27 Sep 2017 09:50:40 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
X-Git-Tag: xonotic-v0.8.5~2119^2~51
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=645d03a6a20adcccd0c0a1142406c67d3b323408;p=xonotic%2Fxonotic-data.pk3dir.git

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

645d03a6a20adcccd0c0a1142406c67d3b323408