From: Lyberta <lyberta@lyberta.net>
Date: Sat, 17 Feb 2018 16:50:48 +0000 (+0300)
Subject: Merge branch 'Lyberta/Survival' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=533f054e2ce461a8b2727a864e00fb9cd7ef3d6b;p=xonotic%2Fxonotic-data.pk3dir.git

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

533f054e2ce461a8b2727a864e00fb9cd7ef3d6b