]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard
authorJack Humbert <jack.humb@gmail.com>
Thu, 5 Feb 2015 17:58:18 +0000 (12:58 -0500)
committerJack Humbert <jack.humb@gmail.com>
Thu, 5 Feb 2015 17:58:18 +0000 (12:58 -0500)

Trivial merge