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

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

effc08b1aa5b3192b93ee2265d0577ef950dd73b