From: Lyberta <lyberta@lyberta.net>
Date: Thu, 5 Oct 2017 18:05:26 +0000 (+0300)
Subject: Merge branch 'Lyberta/Survival' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=02fe41a1a8a58cf7d6d8b4062c41480c97cf753b;p=xonotic%2Fxonotic-data.pk3dir.git

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

02fe41a1a8a58cf7d6d8b4062c41480c97cf753b