]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorXyverz <xyverz@gmail.com>
Sun, 12 Feb 2017 05:57:54 +0000 (21:57 -0800)
committerXyverz <xyverz@gmail.com>
Sun, 12 Feb 2017 05:57:54 +0000 (21:57 -0800)

Trivial merge