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

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

3cf830ba90a3943592f04a0cabbe21088eb86377