]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge pull request #3 from jackhumbert/master
authorAlex Johnstone <alexjj@gmail.com>
Fri, 25 Mar 2016 18:16:33 +0000 (11:16 -0700)
committerAlex Johnstone <alexjj@gmail.com>
Fri, 25 Mar 2016 18:16:33 +0000 (11:16 -0700)
Pull upstream


Trivial merge