]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge remote-tracking branch 'origin/master'
authordbroqua <dbroqua@mousur.org>
Mon, 19 Sep 2016 11:26:18 +0000 (13:26 +0200)
committerdbroqua <dbroqua@mousur.org>
Mon, 19 Sep 2016 11:26:18 +0000 (13:26 +0200)

Trivial merge