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

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

85203282b316346b6f3c86944f99033ea7ffcb29