From: Lyberta <lyberta@lyberta.net>
Date: Sun, 2 Apr 2017 15:37:02 +0000 (+0300)
Subject: Merge branch 'Lyberta/Survival' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=133729168ea9c5c361e50dad084612eb5b2eac20;p=xonotic%2Fxonotic-data.pk3dir.git

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

133729168ea9c5c361e50dad084612eb5b2eac20