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

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

c1276d5aceb985456e799108d10d75e3c3b5ba14