]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'qmk/master'
authorGabriel Young <gabeplaysdrums@live.com>
Sat, 18 Mar 2017 21:48:27 +0000 (14:48 -0700)
committerGabriel Young <gabeplaysdrums@live.com>
Sat, 18 Mar 2017 21:48:27 +0000 (14:48 -0700)

Trivial merge