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

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

f349c0afbcf2c1bb2f58cd24bbabab3fd284030c