]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge https://github.com/qmk/qmk_firmware
authornstickney <nstickney@gmail.com>
Fri, 24 Feb 2017 03:15:40 +0000 (21:15 -0600)
committernstickney <nstickney@gmail.com>
Fri, 24 Feb 2017 03:15:40 +0000 (21:15 -0600)

Trivial merge