]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorXyverz <xyverz@gmail.com>
Thu, 19 Jan 2017 14:54:18 +0000 (06:54 -0800)
committerXyverz <xyverz@gmail.com>
Thu, 19 Jan 2017 14:54:18 +0000 (06:54 -0800)

Trivial merge