]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorXyverz <xyverz@gmail.com>
Fri, 7 Apr 2017 05:07:34 +0000 (22:07 -0700)
committerXyverz <xyverz@gmail.com>
Fri, 7 Apr 2017 05:07:34 +0000 (22:07 -0700)

Trivial merge