From: Lyberta <lyberta@lyberta.net>
Date: Sat, 18 Mar 2017 19:57:31 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/Survival
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=637077cc3328cca1aaa6782a85371ae5304bb0ab;p=xonotic%2Fxonotic-maps.pk3dir.git

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

637077cc3328cca1aaa6782a85371ae5304bb0ab