From: Lyberta <lyberta@lyberta.net>
Date: Sun, 4 Jun 2017 18:46:50 +0000 (+0300)
Subject: Merge branch 'Lyberta/Survival' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=326aee0a9943650d6f80474ed84eeb6cf57e61a8;p=xonotic%2Fxonotic-data.pk3dir.git

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

326aee0a9943650d6f80474ed84eeb6cf57e61a8