Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
authorChris Browne <cbbrowne@hpaq.int.linuxdatabases.info>
Sun, 23 Oct 2016 14:28:02 +0000 (10:28 -0400)
committerChris Browne <cbbrowne@hpaq.int.linuxdatabases.info>
Sun, 23 Oct 2016 14:28:02 +0000 (10:28 -0400)

Trivial merge