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

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

40d8f96de1759b04bb91a876d9d539b7feb1822a