Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7
authorJack Humbert <jack.humb@gmail.com>
Tue, 22 Nov 2016 01:17:45 +0000 (20:17 -0500)
committerJack Humbert <jack.humb@gmail.com>
Tue, 22 Nov 2016 01:17:45 +0000 (20:17 -0500)
1  2 
quantum/quantum.c

Simple merge