]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge remote-tracking branch 'refs/remotes/origin/master' into pc_planck
authorIBNobody <ibnobody@gmail.com>
Thu, 14 Apr 2016 02:45:02 +0000 (21:45 -0500)
committerIBNobody <ibnobody@gmail.com>
Thu, 14 Apr 2016 02:45:02 +0000 (21:45 -0500)

Trivial merge