From: Lyberta <lyberta@lyberta.net>
Date: Wed, 27 Sep 2017 10:01:00 +0000 (+0300)
Subject: Merge branch 'Lyberta/Survival' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f260c9590b0e05d32aea6d3e732bb793e06dea7a;p=xonotic%2Fxonotic-data.pk3dir.git

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

f260c9590b0e05d32aea6d3e732bb793e06dea7a