]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
authorStephan Bösebeck <sb@caluga.de>
Wed, 6 Jan 2016 13:28:13 +0000 (14:28 +0100)
committerStephan Bösebeck <sb@caluga.de>
Wed, 6 Jan 2016 13:28:13 +0000 (14:28 +0100)

Trivial merge