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

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

e17043ccb908aa0083c69786adc96b8599e40702