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

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

3a4f7c4d0f29b0685d2396c1807b574f374b9db3