From: Lyberta <lyberta@lyberta.net>
Date: Sat, 5 Aug 2017 02:45:28 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
X-Git-Tag: xonotic-v0.8.5~2119^2~61
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2e96bd3f374953fcb40468bf47bcb55785e1f8db;p=xonotic%2Fxonotic-data.pk3dir.git

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

2e96bd3f374953fcb40468bf47bcb55785e1f8db