From: Lyberta <lyberta@lyberta.net>
Date: Fri, 9 Mar 2018 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=1c1f0da0037d2b3f64768cab545631b2fdfd6035;p=xonotic%2Fxonotic-data.pk3dir.git

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

1c1f0da0037d2b3f64768cab545631b2fdfd6035