From: Lyberta <lyberta@lyberta.net>
Date: Sat, 16 Sep 2017 03:37:10 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/URS3
X-Git-Tag: xonotic-v0.8.5~2461^2
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=b8b9d9d6006669f36c9c9a7387506242a2955904;p=xonotic%2Fxonotic-data.pk3dir.git

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

b8b9d9d6006669f36c9c9a7387506242a2955904