From: Lyberta <lyberta@lyberta.net>
Date: Sun, 3 Sep 2017 22:11:11 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/KillSound
X-Git-Tag: xonotic-v0.8.5~2173^2~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ecd018b0f2a99be972759503e3efea35b6717ee9;p=xonotic%2Fxonotic-data.pk3dir.git

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

ecd018b0f2a99be972759503e3efea35b6717ee9