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

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

7b9029ad7564752752e1713668d7f752e98fa8b7