From: Lyberta <lyberta@lyberta.net>
Date: Sun, 10 Sep 2017 23:19:54 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/URS3
X-Git-Tag: xonotic-v0.8.5~2461^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=142a0bd18856be565c6d4aed0cda7e743168e7e5;p=xonotic%2Fxonotic-data.pk3dir.git

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

142a0bd18856be565c6d4aed0cda7e743168e7e5