From: Lyberta <lyberta@lyberta.net>
Date: Fri, 6 Oct 2017 19:29:00 +0000 (+0300)
Subject: Merge branch 'Lyberta/Survival' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4d6227e1216760b35ca451e44555100d661ef5c3;p=xonotic%2Fxonotic-data.pk3dir.git

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

4d6227e1216760b35ca451e44555100d661ef5c3