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

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

5fb7dc73b2b45e7bc184ae69a090bfd28efa8f0e