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

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

858ac124fac9bd740a95a3cb17398f857ba54eab