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

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

1b73df9eb67a55f9a8fe5f37216646d3cd276abe