From: Lyberta <lyberta@lyberta.net>
Date: Sun, 30 Jul 2017 05:05:17 +0000 (+0300)
Subject: Merge branch 'Lyberta/Survival' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=943f002626232cb33dd90ed6d28539f22e4b17dc;p=xonotic%2Fxonotic-data.pk3dir.git

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

943f002626232cb33dd90ed6d28539f22e4b17dc