From: Lyberta <lyberta@lyberta.net>
Date: Fri, 28 Apr 2017 21:34:00 +0000 (+0300)
Subject: Merge branch 'Lyberta/Survival' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=73e47e4f52ab70ed042a96e8e0cb94e2fe518c55;p=xonotic%2Fxonotic-data.pk3dir.git

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

73e47e4f52ab70ed042a96e8e0cb94e2fe518c55