]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorCallum Oakley <c.oakley108@gmail.com>
Thu, 1 Sep 2016 16:55:00 +0000 (17:55 +0100)
committerCallum Oakley <c.oakley108@gmail.com>
Thu, 1 Sep 2016 16:55:00 +0000 (17:55 +0100)

Trivial merge