Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
authorcbbrowne <cbbrowne@cbbrowne.tor.int-afilias.info>
Mon, 19 Sep 2016 15:13:53 +0000 (11:13 -0400)
committercbbrowne <cbbrowne@cbbrowne.tor.int-afilias.info>
Mon, 19 Sep 2016 15:13:53 +0000 (11:13 -0400)
commit2c3fcc6c08bf03aef17f7ed74394539187a9c734
tree350f2e3317a1c1bce6f8a9a12df732fe4bcb04ef
parentcc7604d11670cf3155d53f0019557b249b1192c0
parent5f9c2f63ffb2c58db73e67442134be58bfe2c129
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware