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

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

2e9e9fda3aea226e994b0cf63bb574526dec9163