]> 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>
Tue, 29 Nov 2016 17:20:26 +0000 (12:20 -0500)
committercbbrowne <cbbrowne@cbbrowne.tor.int-afilias.info>
Tue, 29 Nov 2016 17:20:26 +0000 (12:20 -0500)

Trivial merge