From: Lyberta <lyberta@lyberta.net>
Date: Sat, 17 Feb 2018 06:42:51 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
X-Git-Tag: xonotic-v0.8.5~2119^2~19
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9adbead408ffe659813aaec0d6753dad3d79c433;p=xonotic%2Fxonotic-data.pk3dir.git

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

9adbead408ffe659813aaec0d6753dad3d79c433