]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorXyverz <xyverz@gmail.com>
Sun, 2 Apr 2017 21:49:39 +0000 (14:49 -0700)
committerXyverz <xyverz@gmail.com>
Sun, 2 Apr 2017 21:49:39 +0000 (14:49 -0700)

Trivial merge