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

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

c6328a28eb5044776450ffd7bc2b4be73eeaa7d5