]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
merging
authorJack Humbert <jack.humb@gmail.com>
Wed, 28 Oct 2015 17:54:41 +0000 (13:54 -0400)
committerJack Humbert <jack.humb@gmail.com>
Wed, 28 Oct 2015 17:54:41 +0000 (13:54 -0400)

Trivial merge