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

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

c2bee8d0379eaa73b0d6a4ccca40bbbba729df2e