Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
authorStephan Bösebeck <stephan.boesebeck@holidayinsider.com>
Fri, 29 Jan 2016 06:46:48 +0000 (07:46 +0100)
committerStephan Bösebeck <stephan.boesebeck@holidayinsider.com>
Fri, 29 Jan 2016 06:46:48 +0000 (07:46 +0100)

Trivial merge