From: Lyberta <lyberta@lyberta.net>
Date: Mon, 13 Mar 2017 12:31:47 +0000 (+0300)
Subject: Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ee31ab45fea507abc225f14d68f876ce61821065;p=xonotic%2Fxonotic-data.pk3dir.git

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

ee31ab45fea507abc225f14d68f876ce61821065