From: Lyberta <lyberta@lyberta.net>
Date: Sat, 3 Jun 2017 17:53:52 +0000 (+0300)
Subject: Merge branch 'Lyberta/Survival' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6881e6bf5f8c36bf629e4816a6d19b739cf7589c;p=xonotic%2Fxonotic-data.pk3dir.git

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

6881e6bf5f8c36bf629e4816a6d19b739cf7589c