]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
authorChris Browne <cbbrowne@hpaq.int.linuxdatabases.info>
Fri, 11 Nov 2016 04:32:29 +0000 (23:32 -0500)
committerChris Browne <cbbrowne@hpaq.int.linuxdatabases.info>
Fri, 11 Nov 2016 04:32:29 +0000 (23:32 -0500)

Trivial merge