From: Lyberta <lyberta@lyberta.net>
Date: Mon, 16 Oct 2017 12:19:01 +0000 (+0300)
Subject: Merge branch 'Lyberta/Survival' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8a2bc27ac45d9a964940c8c54b00472d890ecd9b;p=xonotic%2Fxonotic-data.pk3dir.git

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

8a2bc27ac45d9a964940c8c54b00472d890ecd9b