]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' of https://github.com/Xyverz/qmk_firmware
authorIan Sterling <xyverz@gmail.com>
Tue, 9 Aug 2016 02:40:41 +0000 (19:40 -0700)
committerIan Sterling <xyverz@gmail.com>
Tue, 9 Aug 2016 02:40:41 +0000 (19:40 -0700)

Trivial merge