From: Jann Horn <jannhorn@googlemail.com>
Date: Sun, 4 May 2014 18:35:52 +0000 (+0200)
Subject: Merge branch 'master' of thejh.net:quakecontrol
X-Git-Url: http://git.thejh.net/?p=quakecontrol.git;a=commitdiff_plain;h=HEAD

Merge branch 'master' of thejh.net:quakecontrol
---

0ae8b7fda4fde5c9469feda3fc0be00f333b4a00