From: Lyberta <lyberta@lyberta.net>
Date: Sat, 2 Dec 2017 15:55:11 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
X-Git-Tag: xonotic-v0.8.5~2119^2~48
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=723fe3aa08556fdde679753c0afde734853f34e5;p=xonotic%2Fxonotic-data.pk3dir.git

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

723fe3aa08556fdde679753c0afde734853f34e5