From: Lyberta <lyberta@lyberta.net>
Date: Sat, 2 Dec 2017 17:59:45 +0000 (+0300)
Subject: Merge branch 'Lyberta/Survival' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=82c5d59d5842401b28f5f28910f7aaa3ced68d15;p=xonotic%2Fxonotic-data.pk3dir.git

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

82c5d59d5842401b28f5f28910f7aaa3ced68d15