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

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

b8cd040e4cfc8f32dc4ccf855d096efe4a7bccc8