]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorBrendan Johan Lee <deadcyclo@vanntett.net>
Thu, 26 Jan 2017 10:56:32 +0000 (11:56 +0100)
committerBrendan Johan Lee <deadcyclo@vanntett.net>
Thu, 26 Jan 2017 10:56:32 +0000 (11:56 +0100)

Trivial merge