From: terencehill <piuntn@gmail.com>
Date: Wed, 14 Jun 2017 20:36:12 +0000 (+0200)
Subject: Merge branch 'master' into Mario/win64
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8847a910725c23d50aac932f4830cef7a4b3ae1f;p=xonotic%2Fxonotic.git

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

8847a910725c23d50aac932f4830cef7a4b3ae1f