From: Lyberta <lyberta@lyberta.net>
Date: Wed, 3 May 2017 20:19:08 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/Survival
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b2dccad7c38ffdc3d32da9871e18ce902927f8fb;p=xonotic%2Fxonotic-maps.pk3dir.git

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

b2dccad7c38ffdc3d32da9871e18ce902927f8fb