]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' of github.com:cbbrowne/qmk_firmware
authorcbbrowne <cbbrowne@cbbrowne.tor.int-afilias.info>
Wed, 12 Oct 2016 15:57:46 +0000 (11:57 -0400)
committercbbrowne <cbbrowne@cbbrowne.tor.int-afilias.info>
Wed, 12 Oct 2016 15:57:46 +0000 (11:57 -0400)

Trivial merge