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

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

4362b743f4489b3df9d53f7f04c1faa3a8dfefff