Merge pull request #12 from jackhumbert/master
authorDamien <Dbroqua@users.noreply.github.com>
Sat, 12 Nov 2016 18:33:07 +0000 (19:33 +0100)
committerGitHub <noreply@github.com>
Sat, 12 Nov 2016 18:33:07 +0000 (19:33 +0100)
Merged from qmk


Trivial merge