From: Lyberta <lyberta@lyberta.net>
Date: Fri, 16 Feb 2018 11:06:28 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
X-Git-Tag: xonotic-v0.8.5~2119^2~22
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=0797867d53b78246541c604b24e2eacc08c900f2;ds=sidebyside

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

0797867d53b78246541c604b24e2eacc08c900f2