]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' of https://github.com/gid0/qmk_firmware
authorOlivier <olivier@gid0.org>
Sat, 16 Apr 2016 12:01:00 +0000 (14:01 +0200)
committerOlivier <olivier@gid0.org>
Sat, 16 Apr 2016 12:01:00 +0000 (14:01 +0200)

Trivial merge