From: Lyberta <lyberta@lyberta.net>
Date: Thu, 1 Jun 2017 17:28:13 +0000 (+0300)
Subject: Merge branch 'Lyberta/Survival' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0d03c782c8d35f8e4d1274f1d56c6c51b6d2eb88;p=xonotic%2Fxonotic-data.pk3dir.git

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

0d03c782c8d35f8e4d1274f1d56c6c51b6d2eb88