]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
authorcbbrowne <cbbrowne@cbbrowne.tor.int-afilias.info>
Thu, 1 Dec 2016 17:54:16 +0000 (12:54 -0500)
committercbbrowne <cbbrowne@cbbrowne.tor.int-afilias.info>
Thu, 1 Dec 2016 17:54:16 +0000 (12:54 -0500)

Trivial merge