Merge branch 'master' of github.com:jackhumbert/tmk_keyboard
authorcr3473 <joe@createtank.com>
Tue, 2 Jun 2015 19:16:50 +0000 (12:16 -0700)
committercr3473 <joe@createtank.com>
Tue, 2 Jun 2015 19:16:50 +0000 (12:16 -0700)

Trivial merge