From: Lyberta <lyberta@lyberta.net>
Date: Sun, 2 Apr 2017 08:25:18 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/Survival
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5ef5a7676fb4c676e2097e6a19e7bc1c578bdf61;p=xonotic%2Fxonotic-data.pk3dir.git

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

5ef5a7676fb4c676e2097e6a19e7bc1c578bdf61