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

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

f1df983bc7b50b40cab24091b8d3b01200b61223