Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
authorStephan Bösebeck <sb@caluga.de>
Tue, 19 Apr 2016 21:07:11 +0000 (23:07 +0200)
committerStephan Bösebeck <sb@caluga.de>
Tue, 19 Apr 2016 21:07:11 +0000 (23:07 +0200)
commit6ff5e1059256cfd6ec1cb88c12e90f57c10f44ef
treefa23de88dc8b8d3f3fe6a2e353eaa3ae1e38a1b8
parent04f36b36818885475c0b93046726d7e053691e7a
parenta2ee27715880616a15756e1b9f42183d9fb08051
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware