From: Lyberta <lyberta@lyberta.net>
Date: Wed, 10 May 2017 12:40:55 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
X-Git-Tag: xonotic-v0.8.5~2119^2~69
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=00a0bc7a2ef3ba8b9c0d7edb1c066b8dac3d0298;p=xonotic%2Fxonotic-data.pk3dir.git

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

00a0bc7a2ef3ba8b9c0d7edb1c066b8dac3d0298