]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authordbroqua <dbroqua@mousur.org>
Tue, 23 Aug 2016 18:39:01 +0000 (20:39 +0200)
committerdbroqua <dbroqua@mousur.org>
Tue, 23 Aug 2016 18:39:01 +0000 (20:39 +0200)

Trivial merge