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

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

8b0d514d0ecd8ad48810bd9cc935d73071fc510a