]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authornstickney <nstickney@gmail.com>
Thu, 9 Mar 2017 04:29:12 +0000 (22:29 -0600)
committernstickney <nstickney@gmail.com>
Thu, 9 Mar 2017 04:29:12 +0000 (22:29 -0600)

Trivial merge