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: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=d54b296b7ed070f80df0ec7e2a596f1182d2f74f

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

d54b296b7ed070f80df0ec7e2a596f1182d2f74f