From: Lyberta <lyberta@lyberta.net>
Date: Sun, 27 Aug 2017 23:47:20 +0000 (+0300)
Subject: Merge branch 'Lyberta/Survival' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=66f57b4bdb41371bca7eafb3ea26b517bf4b6cb7;p=xonotic%2Fxonotic-data.pk3dir.git

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

66f57b4bdb41371bca7eafb3ea26b517bf4b6cb7