From: Mario <mario@smbclan.net>
Date: Thu, 24 Mar 2016 17:09:40 +0000 (+1000)
Subject: Merge branch 'master' into Mario/melano_osx_winfix
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2FMario%2Fmelano_osx_winfix;p=xonotic%2Fxonotic.git

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

d54b296b7ed070f80df0ec7e2a596f1182d2f74f