]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
authorChristopher Browne <cbbrowne@ca.afilias.info>
Tue, 24 May 2016 16:34:08 +0000 (12:34 -0400)
committerChristopher Browne <cbbrowne@ca.afilias.info>
Tue, 24 May 2016 16:34:08 +0000 (12:34 -0400)

Trivial merge