]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard
authorJack Humbert <jack.humb@gmail.com>
Fri, 20 Mar 2015 17:46:40 +0000 (13:46 -0400)
committerJack Humbert <jack.humb@gmail.com>
Fri, 20 Mar 2015 17:46:40 +0000 (13:46 -0400)

Trivial merge