]> 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>
Wed, 16 Nov 2016 22:05:11 +0000 (17:05 -0500)
committercbbrowne <cbbrowne@cbbrowne.tor.int-afilias.info>
Wed, 16 Nov 2016 22:05:11 +0000 (17:05 -0500)

Trivial merge