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

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

e97de604c9a9a8e86f9aa5851a5c24ecff86cc35