From: Lyberta <lyberta@lyberta.net>
Date: Sat, 5 Aug 2017 09:57:41 +0000 (+0300)
Subject: Merged master.
X-Git-Tag: xonotic-v0.8.5~2482^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=acf114225f94bed609c10c74e1bb1277d28a7419;p=xonotic%2Fxonotic-data.pk3dir.git

Merged master.
---

acf114225f94bed609c10c74e1bb1277d28a7419