]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
authorChristopher Browne <cbbrowne@ca.afilias.info>
Fri, 29 Jan 2016 20:39:57 +0000 (15:39 -0500)
committerChristopher Browne <cbbrowne@ca.afilias.info>
Fri, 29 Jan 2016 20:39:57 +0000 (15:39 -0500)

Trivial merge