From: Lyberta <lyberta@lyberta.net>
Date: Wed, 14 Feb 2018 08:26:56 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
X-Git-Tag: xonotic-v0.8.5~2119^2~27
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2afec0885c14c3c9d6cc58377ed7794f376bfa01;p=xonotic%2Fxonotic-data.pk3dir.git

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

2afec0885c14c3c9d6cc58377ed7794f376bfa01