]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge remote-tracking branch 'remotes/jackhumbert/master'
authorIBNobody <ibnobody@gmail.com>
Sat, 11 Jun 2016 18:28:27 +0000 (13:28 -0500)
committerIBNobody <ibnobody@gmail.com>
Sat, 11 Jun 2016 18:28:27 +0000 (13:28 -0500)

Trivial merge