]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
authorJack Humbert <jack.humb@gmail.com>
Tue, 18 Oct 2016 17:58:20 +0000 (13:58 -0400)
committerJack Humbert <jack.humb@gmail.com>
Tue, 18 Oct 2016 17:58:20 +0000 (13:58 -0400)

Trivial merge