Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
authorclimbalima <climbalima@gmail.com>
Thu, 17 Nov 2016 00:28:30 +0000 (19:28 -0500)
committerclimbalima <climbalima@gmail.com>
Thu, 17 Nov 2016 00:28:30 +0000 (19:28 -0500)

Trivial merge