From: Mario <zacjardine@y7mail.com>
Date: Sat, 31 Dec 2016 01:25:48 +0000 (+0000)
Subject: Merge branch 'martin-t/misc' into 'master'
X-Git-Tag: xonotic-v0.8.2~342
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fca1fc158c44eff425d73fa279900144249aca16;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'martin-t/misc' into 'master'

martin-t/misc

See merge request !399
---

fca1fc158c44eff425d73fa279900144249aca16