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

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

3005fcdac8e0f844eed81dec920dbd3776c80f08