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

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

2dffbe5ed504cb3789a359fb0dab9886bf7fae6a