]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard
authorJack Humbert <jack.humb@gmail.com>
Mon, 9 Nov 2015 19:24:56 +0000 (14:24 -0500)
committerJack Humbert <jack.humb@gmail.com>
Mon, 9 Nov 2015 19:24:56 +0000 (14:24 -0500)

Trivial merge