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

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

900c7c4ff1cc0eb4dd6e9d99f4e3942b25ebc3c6