]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' of github.com:cbbrowne/qmk_firmware
authorcbbrowne <cbbrowne@cbbrowne.tor.int-afilias.info>
Mon, 7 Nov 2016 17:49:05 +0000 (12:49 -0500)
committercbbrowne <cbbrowne@cbbrowne.tor.int-afilias.info>
Mon, 7 Nov 2016 17:49:05 +0000 (12:49 -0500)

Trivial merge