]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' of http://github.com/jackhumbert/qmk_firmware
authorStephen Christie <undersampled@live.com>
Wed, 3 Aug 2016 02:51:30 +0000 (22:51 -0400)
committerStephen Christie <undersampled@live.com>
Wed, 3 Aug 2016 02:51:30 +0000 (22:51 -0400)

Trivial merge