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

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

6a0bc496ce3f9b08a5c4f433ba0cf24ea5ef6df2