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

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

5e97018f6e9428ede3be4df06d2f2da17b774518