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

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

5c04af5132288f91cace5a311f88ab933954ecac