From: Mario <zacjardine@y7mail.com>
Date: Fri, 7 Apr 2017 04:05:38 +0000 (+0000)
Subject: Merge branch 'amade/small-fixes' into 'master'
X-Git-Tag: xonotic-v0.8.5~2843
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2f215c603bf1b4dd44b9d166180f535c88602e9f;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'amade/small-fixes' into 'master'

Amade/small fixes

See merge request !412
---

2f215c603bf1b4dd44b9d166180f535c88602e9f