From: Lyberta <lyberta@lyberta.net>
Date: Sat, 2 Sep 2017 14:19:30 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/URS3
X-Git-Tag: xonotic-v0.8.5~2119^2~53^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=585860c962df7da3cdc76f0b4e87ba4e028e42d5;p=xonotic%2Fxonotic-data.pk3dir.git

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

585860c962df7da3cdc76f0b4e87ba4e028e42d5