]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorDaniel <danielallendeutsch@gmail.com>
Thu, 1 Sep 2016 04:15:47 +0000 (22:15 -0600)
committerDaniel <danielallendeutsch@gmail.com>
Thu, 1 Sep 2016 04:15:47 +0000 (22:15 -0600)

Trivial merge