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

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

18085b81f9dca24c85e1001d701512206deca102