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

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

d2e7a18eae7f070515fadb33814fef9d960cc65d