]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorxyverz <xyverz@gmail.com>
Sat, 19 Nov 2016 17:31:34 +0000 (09:31 -0800)
committerxyverz <xyverz@gmail.com>
Sat, 19 Nov 2016 17:31:34 +0000 (09:31 -0800)

Trivial merge