]> 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>
Mon, 17 Oct 2016 00:59:52 +0000 (20:59 -0400)
committerChris Browne <cbbrowne@hpaq.int.linuxdatabases.info>
Mon, 17 Oct 2016 00:59:52 +0000 (20:59 -0400)

Trivial merge