From: Lyberta <lyberta@lyberta.net>
Date: Sat, 10 Feb 2018 18:41:47 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
X-Git-Tag: xonotic-v0.8.5~2119^2~38
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=531fa1eb217365d964f726f2c818db8db9cd9a7f;p=xonotic%2Fxonotic-data.pk3dir.git

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

531fa1eb217365d964f726f2c818db8db9cd9a7f