From: Lyberta <lyberta@lyberta.net>
Date: Sat, 25 Nov 2017 06:47:42 +0000 (+0300)
Subject: Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7d8824fed4c486b06f587f137870b0df70d61535;p=xonotic%2Fxonotic-data.pk3dir.git

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

7d8824fed4c486b06f587f137870b0df70d61535