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

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

78566ed20a5a9f747f8bdc244cd5637a0bbd3b95