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

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

14310cf8b83184cc045c659c7b962e47588244c8