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

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

316f14f8ab7bf5e4ea957f9a0aefb8fecfedf34b