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

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

5e02d34db9f00238ffa1244e010ea31a2665c2bb