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

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

3a68cf09f48204dc16882742ca551a2fc3f7d828