]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge remote-tracking branch 'origin/master'
authordbroqua <dbroqua@mousur.org>
Sat, 1 Oct 2016 16:28:48 +0000 (18:28 +0200)
committerdbroqua <dbroqua@mousur.org>
Sat, 1 Oct 2016 16:28:48 +0000 (18:28 +0200)

Trivial merge