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

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

80f16973070c97be59967642c9b965666451355a