]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authornstickney <nstickney@gmail.com>
Wed, 8 Mar 2017 01:09:56 +0000 (19:09 -0600)
committernstickney <nstickney@gmail.com>
Wed, 8 Mar 2017 01:09:56 +0000 (19:09 -0600)

Trivial merge