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

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

6ea378ed7281901b891db97aab3cb7e50f9a3dbd