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

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

a0a2050087e3688aad8bd2d85dfb16bada67d0f6