From: Lyberta <lyberta@lyberta.net>
Date: Tue, 28 Mar 2017 08:53:27 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/Survival
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7036e282518de5d22e458b8d8e3dd63b879ced2c;p=xonotic%2Fxonotic-data.pk3dir.git

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

7036e282518de5d22e458b8d8e3dd63b879ced2c