]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorxyverz <xyverz@gmail.com>
Wed, 7 Dec 2016 01:36:19 +0000 (17:36 -0800)
committerxyverz <xyverz@gmail.com>
Wed, 7 Dec 2016 01:36:19 +0000 (17:36 -0800)

Trivial merge