]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' of https://github.com/Skrymir/qmk_firmware
authorJosh Colbeck <skrymir@gmail.com>
Thu, 7 Jul 2016 04:38:58 +0000 (23:38 -0500)
committerJosh Colbeck <skrymir@gmail.com>
Thu, 7 Jul 2016 04:38:58 +0000 (23:38 -0500)

Trivial merge