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

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

042b9e3b6b5de56e099e4b3bfb5c47f1c0438dad