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

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

d123c9542f53880a3cd16c16d6dd87df507432e1