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

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

cace5deb50859dcb18e15e80b07265988ea40dc3