From: Lyberta <lyberta@lyberta.net>
Date: Fri, 2 Jun 2017 22:26:21 +0000 (+0300)
Subject: Merge branch 'Lyberta/Survival' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=196f52584932e099b125a49f00b74a1e518ae771;p=xonotic%2Fxonotic-data.pk3dir.git

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

196f52584932e099b125a49f00b74a1e518ae771