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

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

121f83a4533d6c29ec468d7cd31a5d473d1f2aed