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

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

da1a0540e952510633ddac24231f68da07042780