From: Lyberta <lyberta@lyberta.net>
Date: Wed, 5 Jul 2017 23:29:37 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/Survival
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9d7405a0a0b44d5f6807becbf02f01f60ae77033;p=xonotic%2Fxonotic-maps.pk3dir.git

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

9d7405a0a0b44d5f6807becbf02f01f60ae77033