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

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

ae0d28eac6f13d6a0710cfcfefc3211c6605089e