Merge branch 'master' of thejh.net:quakecontrol master
authorJann Horn <jannhorn@googlemail.com>
Sun, 4 May 2014 18:35:52 +0000 (20:35 +0200)
committerJann Horn <jannhorn@googlemail.com>
Sun, 4 May 2014 18:35:52 +0000 (20:35 +0200)
commit0ae8b7fda4fde5c9469feda3fc0be00f333b4a00
treef175b46a88a7bd2d01ea3dc92a0da10ae95446ae
parente0bb37a7fca22a9d6339f5afc5ddafc153cd99d6
parent92db67cc4b2c824d85e3df7c9947d5bd6a11af73
Merge branch 'master' of thejh.net:quakecontrol