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

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

cb2cb3c9019ef2007ac63da9c6c7f66d8e62dbd2