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

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

18da05ab673b634dc34a04686431af1d6c171638