From: Lyberta <lyberta@lyberta.net>
Date: Wed, 12 Apr 2017 03:51:32 +0000 (+0300)
Subject: Merge branch 'Lyberta/Survival' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=39f218d0773c25427741e7b26af2cc1a8c7f2f88;p=xonotic%2Fxonotic-data.pk3dir.git

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

39f218d0773c25427741e7b26af2cc1a8c7f2f88