]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge remote-tracking branch 'origin/master'
authordbroqua <dbroqua@mousur.org>
Sun, 2 Apr 2017 21:27:57 +0000 (23:27 +0200)
committerdbroqua <dbroqua@mousur.org>
Sun, 2 Apr 2017 21:27:57 +0000 (23:27 +0200)

Trivial merge