]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' of https://github.com/johgh/qmk_firmware
authorjorge <jhervas@direla.com>
Mon, 30 May 2016 17:41:29 +0000 (19:41 +0200)
committerjorge <jhervas@direla.com>
Mon, 30 May 2016 17:41:29 +0000 (19:41 +0200)

Trivial merge