]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge remote-tracking branch 'remotes/jackhumbert/master'
authorIBNobody <ibnobody@gmail.com>
Tue, 24 May 2016 22:57:40 +0000 (17:57 -0500)
committerIBNobody <ibnobody@gmail.com>
Tue, 24 May 2016 22:57:40 +0000 (17:57 -0500)

Trivial merge