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

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

88143d3b9d7e5772646df20b9e82b3e461970fe0