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

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

b68184db5f2e6caad5ded483e0a548a09506a2d7