]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge remote-tracking branch 'jackhumbert/master' into typematrix
authorDidier Loiseau <didierloiseau+git@gmail.com>
Sat, 23 Jan 2016 15:44:59 +0000 (16:44 +0100)
committerDidier Loiseau <didierloiseau+git@gmail.com>
Sat, 23 Jan 2016 15:44:59 +0000 (16:44 +0100)

Trivial merge