Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
authorStephan Bösebeck <sb@caluga.de>
Sat, 30 Jan 2016 23:17:25 +0000 (00:17 +0100)
committerStephan Bösebeck <sb@caluga.de>
Sat, 30 Jan 2016 23:17:25 +0000 (00:17 +0100)
commit1531350125b5a8e7eefc5f04ed4c372262ec6743
treebf53db1493c0ed6e1719da553d7ac9f32374a8d6
parentbf64046a044987ebcccfa286a88dc8a981d5508b
parent3008c6c6f7aef6c5129e9301a3e96c71ac018ea0
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware