]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge pull request #5 from jackhumbert/master
authorAlex Johnstone <alexjj@gmail.com>
Tue, 5 Apr 2016 14:44:37 +0000 (07:44 -0700)
committerAlex Johnstone <alexjj@gmail.com>
Tue, 5 Apr 2016 14:44:37 +0000 (07:44 -0700)
Sync with upstream


Trivial merge