]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' of github.com:cbbrowne/qmk_firmware
authorChristopher Browne <cbbrowne@ca.afilias.info>
Wed, 3 Feb 2016 18:42:42 +0000 (13:42 -0500)
committerChristopher Browne <cbbrowne@ca.afilias.info>
Wed, 3 Feb 2016 18:42:42 +0000 (13:42 -0500)

Trivial merge