From: Lyberta <lyberta@lyberta.net>
Date: Wed, 3 May 2017 23:15:49 +0000 (+0300)
Subject: Merge branch 'Lyberta/Survival' into Lyberta/master
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=5234aa378b090c3ae3759f626bba79f723ad46e2;p=xonotic%2Fxonotic-data.pk3dir.git

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

5234aa378b090c3ae3759f626bba79f723ad46e2