]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorXyverz <xyverz@gmail.com>
Sat, 4 Mar 2017 03:28:35 +0000 (19:28 -0800)
committerXyverz <xyverz@gmail.com>
Sat, 4 Mar 2017 03:28:35 +0000 (19:28 -0800)

Trivial merge