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

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

d0a58e93ab616d27474fb2e677d853c12e9c4e2d