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

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

ab765ede851270ed866e43a504d37b8883a6111d