From: Lyberta <lyberta@lyberta.net>
Date: Wed, 4 Apr 2018 16:55:35 +0000 (+0300)
Subject: Merge branch 'Lyberta/Survival' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2740575b7d2a382faeec12930362c01f5e5051bb;p=xonotic%2Fxonotic-data.pk3dir.git

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

2740575b7d2a382faeec12930362c01f5e5051bb