From: Lyberta <lyberta@lyberta.net>
Date: Thu, 1 Jun 2017 13:10:39 +0000 (+0300)
Subject: Merge branch 'Lyberta/Survival' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=377118d83d5aa163a067854eadb767769a709781;p=xonotic%2Fxonotic-data.pk3dir.git

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

377118d83d5aa163a067854eadb767769a709781