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

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

2e88a274717e62d0f1e759502a9642c65db1d608