]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
authorDavid Olsson <david.olsson@softhouse.se>
Wed, 18 Jan 2017 21:58:49 +0000 (22:58 +0100)
committerDavid Olsson <david.olsson@softhouse.se>
Wed, 18 Jan 2017 21:58:49 +0000 (22:58 +0100)

Trivial merge