From: Lyberta <lyberta@lyberta.net>
Date: Sat, 18 Mar 2017 13:48:42 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
X-Git-Tag: xonotic-v0.8.5~2119^2~81
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=e076f5c8ca4d962d165bc0e83723babc95c9128f;p=xonotic%2Fxonotic-data.pk3dir.git

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

e076f5c8ca4d962d165bc0e83723babc95c9128f