From: Lyberta <lyberta@lyberta.net>
Date: Sun, 25 Jun 2017 17:46:33 +0000 (+0300)
Subject: Merge branch 'Lyberta/Survival' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0ff977f0bb244d84033b631d2afdcacf3155ffe4;p=xonotic%2Fxonotic-data.pk3dir.git

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

0ff977f0bb244d84033b631d2afdcacf3155ffe4