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

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

2da545d56b096768828e29b2c9ca4e57991cddd3