From: Lyberta <lyberta@lyberta.net>
Date: Thu, 5 Oct 2017 18:54:33 +0000 (+0300)
Subject: Merge branch 'Lyberta/Survival' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=20fedcb1ce9b0dcbe714dcea99b01012dc0b3315;p=xonotic%2Fxonotic-data.pk3dir.git

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

20fedcb1ce9b0dcbe714dcea99b01012dc0b3315