]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' of github.com:cbbrowne/qmk_firmware
authorChristopher Browne <cbbrowne@hpaq.int.linuxdatabases.info>
Tue, 2 Feb 2016 01:53:58 +0000 (20:53 -0500)
committerChristopher Browne <cbbrowne@hpaq.int.linuxdatabases.info>
Tue, 2 Feb 2016 01:53:58 +0000 (20:53 -0500)

Trivial merge