]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
authorChristopher Browne <cbbrowne@hpaq.int.linuxdatabases.info>
Sun, 7 Feb 2016 00:49:52 +0000 (19:49 -0500)
committerChristopher Browne <cbbrowne@hpaq.int.linuxdatabases.info>
Sun, 7 Feb 2016 00:49:52 +0000 (19:49 -0500)

Trivial merge