]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge remote-tracking branch 'refs/remotes/jackhumbert/master' into pc_atomic_planck
authorIBNobody <protospherex@gmail.com>
Thu, 14 Apr 2016 13:58:10 +0000 (08:58 -0500)
committerIBNobody <protospherex@gmail.com>
Thu, 14 Apr 2016 13:58:10 +0000 (08:58 -0500)

Trivial merge