From: Mario <mario@smbclan.net>
Date: Tue, 5 Apr 2016 22:55:40 +0000 (+1000)
Subject: Merge branch 'master' into Mario/hagar_notfixed
X-Git-Tag: xonotic-v0.8.2~968^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F297%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/hagar_notfixed
---

3cfb64730d883ae9ccf0315f365da19345270890