From: Lyberta <lyberta@lyberta.net>
Date: Fri, 28 Apr 2017 18:48:31 +0000 (+0300)
Subject: Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5307d7fefbef76a87924884deadb8eb9e7e95470;p=xonotic%2Fxonotic-data.pk3dir.git

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

5307d7fefbef76a87924884deadb8eb9e7e95470