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

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

5d326eeb22fa9bceb4e6139ed2e77480501e8fc3