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

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

bb8b520b2c42c8918c0b48da86068e68b95f7111