From: Lyberta <lyberta@lyberta.net>
Date: Fri, 24 Mar 2017 05:40:12 +0000 (+0300)
Subject: Merge branch 'Lyberta/Survival' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=68db11c2ecbf1620558cbfae7ff2b9946bdf97a8;p=xonotic%2Fxonotic-data.pk3dir.git

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

68db11c2ecbf1620558cbfae7ff2b9946bdf97a8