From: Lyberta <lyberta@lyberta.net>
Date: Tue, 22 Aug 2017 20:00:35 +0000 (+0300)
Subject: Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=23f9cf107cc057192fee3695e4e95261aa6bf205;p=xonotic%2Fxonotic-data.pk3dir.git

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

23f9cf107cc057192fee3695e4e95261aa6bf205