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

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

8dfae0976f5d90cadd1189a29efff834b8d11c32