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

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

da4a07ffb3ba8c86f720b0e11a248e89ba792d59