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

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

2171a992ae56cebcc209436fadfad770e1dc0bca