]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
authorChristopher Browne <cbbrowne@ca.afilias.info>
Wed, 30 Mar 2016 17:14:01 +0000 (13:14 -0400)
committerChristopher Browne <cbbrowne@ca.afilias.info>
Wed, 30 Mar 2016 17:14:01 +0000 (13:14 -0400)

Trivial merge