From: Lyberta <lyberta@lyberta.net>
Date: Wed, 29 Mar 2017 05:48:49 +0000 (+0300)
Subject: Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=132d97c1aceb58edc5af7a81368bb43be49bde4e;p=xonotic%2Fxonotic-data.pk3dir.git

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

132d97c1aceb58edc5af7a81368bb43be49bde4e