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

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

da9e4b5c39d365cf9ccde95473ff0069e94caf6c