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

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

b5671ebc9d198570bcf255fff270875a39564643