]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' of github.com:jackhumbert/qmk_firmware
authorNathan Sharfi <me@ngalt.com>
Tue, 31 May 2016 22:22:45 +0000 (15:22 -0700)
committerNathan Sharfi <me@ngalt.com>
Tue, 31 May 2016 22:22:45 +0000 (15:22 -0700)

Trivial merge