]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorxyverz <xyverz@gmail.com>
Sat, 17 Sep 2016 05:06:15 +0000 (22:06 -0700)
committerxyverz <xyverz@gmail.com>
Sat, 17 Sep 2016 05:06:15 +0000 (22:06 -0700)

Trivial merge