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

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

74db0c5c4cf1a04ed174563370ef9e24efc39de2