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

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

c8341c7db42d779d189f49a1ef69ca3885b8c9d3