From: Lyberta <lyberta@lyberta.net>
Date: Thu, 23 Mar 2017 07:19:44 +0000 (+0300)
Subject: Merge branch 'Lyberta/Survival' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6478a1f035f757731eac6430ae1353af27589e01;p=xonotic%2Fxonotic-data.pk3dir.git

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

6478a1f035f757731eac6430ae1353af27589e01