From: Lyberta <lyberta@lyberta.net>
Date: Mon, 9 Apr 2018 01:38:00 +0000 (+0300)
Subject: Merge branch 'Lyberta/Survival' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=199b9c72879174ddd73efcdbfeb9735e4ef6a56e;p=xonotic%2Fxonotic-data.pk3dir.git

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

199b9c72879174ddd73efcdbfeb9735e4ef6a56e