From: Lyberta <lyberta@lyberta.net>
Date: Thu, 23 Mar 2017 04:32:07 +0000 (+0300)
Subject: Merge branch 'Lyberta/Survival' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ba49d24e68fac85ffb4dbda849cfe2cb374bd8eb;p=xonotic%2Fxonotic-data.pk3dir.git

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

ba49d24e68fac85ffb4dbda849cfe2cb374bd8eb