]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'qmk/master'
authorGabriel Young <gabeplaysdrums@live.com>
Sun, 19 Feb 2017 22:34:58 +0000 (14:34 -0800)
committerGabriel Young <gabeplaysdrums@live.com>
Sun, 19 Feb 2017 22:34:58 +0000 (14:34 -0800)

Trivial merge