From: Lyberta <lyberta@lyberta.net>
Date: Mon, 8 Jan 2018 16:04:02 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/KillSound
X-Git-Tag: xonotic-v0.8.5~2173^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=02656a36f5e7fe11380396bfa78c0d0049e19891;p=xonotic%2Fxonotic-data.pk3dir.git

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

02656a36f5e7fe11380396bfa78c0d0049e19891