]> 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>
Sun, 6 Nov 2016 12:52:21 +0000 (07:52 -0500)
committerChris Browne <cbbrowne@hpaq.int.linuxdatabases.info>
Sun, 6 Nov 2016 12:52:21 +0000 (07:52 -0500)

Trivial merge