]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' of https://github.com/mazinbokhari/qmk_firmware
authorMazin Bokhari <mazin.bokhari@gmail.com>
Sun, 17 Jul 2016 20:35:05 +0000 (15:35 -0500)
committerMazin Bokhari <mazin.bokhari@gmail.com>
Sun, 17 Jul 2016 20:35:05 +0000 (15:35 -0500)

Trivial merge