]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
authorChristopher Browne <cbbrowne@ca.afilias.info>
Thu, 26 May 2016 19:17:00 +0000 (15:17 -0400)
committerChristopher Browne <cbbrowne@ca.afilias.info>
Thu, 26 May 2016 19:17:00 +0000 (15:17 -0400)

Trivial merge