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

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

c98a0334a03108340377c58d82be64010e362b72