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

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

43705686d01ecf147d61b4664b3fc9d75062b612