]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorBrendan Johan Lee <deadcyclo@vanntett.net>
Tue, 10 Jan 2017 18:21:33 +0000 (19:21 +0100)
committerBrendan Johan Lee <deadcyclo@vanntett.net>
Tue, 10 Jan 2017 18:21:33 +0000 (19:21 +0100)

Trivial merge