]> 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, 17 Oct 2016 14:54:09 +0000 (10:54 -0400)
committercbbrowne <cbbrowne@cbbrowne.tor.int-afilias.info>
Mon, 17 Oct 2016 14:54:09 +0000 (10:54 -0400)

Trivial merge