From: Lyberta <lyberta@lyberta.net>
Date: Wed, 12 Apr 2017 07:51:50 +0000 (+0300)
Subject: Merge branch 'Lyberta/Survival' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a344de638829ed57716c1416176f01f20c930a20;p=xonotic%2Fxonotic-data.pk3dir.git

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

a344de638829ed57716c1416176f01f20c930a20