From: Lyberta <lyberta@lyberta.net>
Date: Mon, 8 Jan 2018 16:13:53 +0000 (+0300)
Subject: Merge branch 'Lyberta/Survival' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=407dfa0017f125888d647411794e1baaedb63c1e;p=xonotic%2Fxonotic-maps.pk3dir.git

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

407dfa0017f125888d647411794e1baaedb63c1e