]> 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>
Mon, 28 Nov 2016 17:27:42 +0000 (12:27 -0500)
committercbbrowne <cbbrowne@cbbrowne.tor.int-afilias.info>
Mon, 28 Nov 2016 17:27:42 +0000 (12:27 -0500)

Trivial merge