]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorXyverz <xyverz@gmail.com>
Mon, 22 Aug 2016 02:02:32 +0000 (19:02 -0700)
committerXyverz <xyverz@gmail.com>
Mon, 22 Aug 2016 02:02:32 +0000 (19:02 -0700)

Trivial merge