From: terencehill <piuntn@gmail.com>
Date: Mon, 28 Aug 2017 13:11:00 +0000 (+0200)
Subject: Merge branch 'master' into Mario/win64
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;ds=sidebyside;h=01c0c7c4694ebd2ec969185f4a935cd478497982;p=xonotic%2Fxonotic.git

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

01c0c7c4694ebd2ec969185f4a935cd478497982