]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorTobias Matt <t.matt81+github@gmail.com>
Fri, 13 May 2016 08:08:29 +0000 (10:08 +0200)
committerTobias Matt <t.matt81+github@gmail.com>
Fri, 13 May 2016 08:08:29 +0000 (10:08 +0200)

Trivial merge