]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
merging
authorJack Humbert <jack.humb@gmail.com>
Sun, 17 Apr 2016 22:15:35 +0000 (18:15 -0400)
committerJack Humbert <jack.humb@gmail.com>
Sun, 17 Apr 2016 22:15:35 +0000 (18:15 -0400)

Trivial merge