From: Lyberta <lyberta@lyberta.net>
Date: Fri, 27 Apr 2018 09:21:48 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
X-Git-Tag: xonotic-v0.8.5~2119^2~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=821767330613f134fe04791532f44e63741ee6c6;p=xonotic%2Fxonotic-data.pk3dir.git

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

821767330613f134fe04791532f44e63741ee6c6