From: Lyberta <lyberta@lyberta.net>
Date: Sun, 11 Mar 2018 06:15:20 +0000 (+0300)
Subject: Merge branch 'Lyberta/Survival' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7d61ba9fba40073163eaa378c4f9580cae7e34b1;p=xonotic%2Fxonotic-data.pk3dir.git

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

7d61ba9fba40073163eaa378c4f9580cae7e34b1