From: Lyberta <lyberta@lyberta.net>
Date: Wed, 3 May 2017 22:03:38 +0000 (+0300)
Subject: Merge branch 'Lyberta/Survival' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3fb7a9d653673e1a302046f41e1f525f9aabab7a;p=xonotic%2Fxonotic-data.pk3dir.git

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

3fb7a9d653673e1a302046f41e1f525f9aabab7a