From: Lyberta <lyberta@lyberta.net>
Date: Wed, 24 May 2017 04:33:43 +0000 (+0300)
Subject: Merge branch 'Lyberta/Survival' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=97709e9fcb8fc6fcbcffff681f781cbef2eca1c8;p=xonotic%2Fxonotic-data.pk3dir.git

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

97709e9fcb8fc6fcbcffff681f781cbef2eca1c8