]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge remote-tracking branch 'jackhumbert/master' into patch-1
authorJosh Colbeck <skrymir@gmail.com>
Mon, 4 Jul 2016 20:41:58 +0000 (15:41 -0500)
committerJosh Colbeck <skrymir@gmail.com>
Mon, 4 Jul 2016 20:41:58 +0000 (15:41 -0500)

Trivial merge