]> 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, 31 Jan 2016 18:08:47 +0000 (13:08 -0500)
committerChristopher Browne <cbbrowne@hpaq.int.linuxdatabases.info>
Sun, 31 Jan 2016 18:08:47 +0000 (13:08 -0500)

Trivial merge