From: Lyberta <lyberta@lyberta.net>
Date: Mon, 16 Jul 2018 13:35:42 +0000 (+0300)
Subject: Merge branch 'Lyberta/Survival' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=aa61613b9fea4bb405ddb3f9ab31847993e45661;p=xonotic%2Fxonotic-data.pk3dir.git

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

aa61613b9fea4bb405ddb3f9ab31847993e45661