From: Lyberta <lyberta@lyberta.net>
Date: Wed, 29 Mar 2017 05:47:37 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
X-Git-Tag: xonotic-v0.8.5~2119^2~77
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=725a0a04e9118c9ca833987803f8f80a08360aa0;p=xonotic%2Fxonotic-data.pk3dir.git

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

725a0a04e9118c9ca833987803f8f80a08360aa0