]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware into jackhumbert...
authorLucas Hecht <Lucas Hecht>
Thu, 25 Feb 2016 20:40:16 +0000 (21:40 +0100)
committerLucas Hecht <Lucas Hecht>
Thu, 25 Feb 2016 20:40:16 +0000 (21:40 +0100)

Trivial merge