]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge
authorIBNobody <ibnobody@gmail.com>
Sat, 20 Aug 2016 13:16:06 +0000 (08:16 -0500)
committerIBNobody <ibnobody@gmail.com>
Sat, 20 Aug 2016 13:16:06 +0000 (08:16 -0500)

Trivial merge