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

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

39fd7bb5dfb381ec1db59b683471d11a38b241d6