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

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

09b3299b49c7a3203e4c40062d3c2b45b06a1322