]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorXyverz <xyverz@gmail.com>
Sat, 11 Feb 2017 07:34:27 +0000 (23:34 -0800)
committerXyverz <xyverz@gmail.com>
Sat, 11 Feb 2017 07:34:27 +0000 (23:34 -0800)

Trivial merge