From: Lyberta <lyberta@lyberta.net>
Date: Sun, 21 Jan 2018 03:07:43 +0000 (+0300)
Subject: Merge branch 'Lyberta/Survival' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5e76e849e31e647a4ed4290713f7bc646308f76a;p=xonotic%2Fxonotic-data.pk3dir.git

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

5e76e849e31e647a4ed4290713f7bc646308f76a