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

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

3eba5b41d9a44bf5f3263d363a53186ddb266566