]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge remote-tracking branch 'jackhumbert/master' into make-keymap-names-consistent
authorNoah Andrews <NoahAndrews@users.noreply.github.com>
Wed, 30 Mar 2016 00:03:22 +0000 (20:03 -0400)
committerNoah Andrews <NoahAndrews@users.noreply.github.com>
Wed, 30 Mar 2016 00:03:22 +0000 (20:03 -0400)

Trivial merge