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

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

a75cf30e9d196c9289b87640c2cca6ae76dc9dc3