]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorxyverz <xyverz@gmail.com>
Mon, 9 Jan 2017 05:47:08 +0000 (21:47 -0800)
committerxyverz <xyverz@gmail.com>
Mon, 9 Jan 2017 05:47:08 +0000 (21:47 -0800)

Trivial merge