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

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

fd141b57fc8a7f1ce74f1126761597bef470f593