From: Lyberta <lyberta@lyberta.net>
Date: Sun, 25 Jun 2017 17:46:23 +0000 (+0300)
Subject: Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=455512225f1cd048a0ae3cb71161162ce2d4e6a0;p=xonotic%2Fxonotic-data.pk3dir.git

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

455512225f1cd048a0ae3cb71161162ce2d4e6a0