Merge pull request #70 from rsrdesarrollo/master
commit78a47df8d1e33e7e3f60a2c11c91a2edbc7d9f7a
authorHephaestos <hephaestos@riseup.net>
Sun, 4 Oct 2015 18:16:21 +0000 (4 18:16 +0000)
committerHephaestos <hephaestos@riseup.net>
Sun, 4 Oct 2015 18:16:21 +0000 (4 18:16 +0000)
tree2943221a942fc0757f46922cd053a351d1fb7175
parent0fd752c8fa7bc84a5c787c4ad20a3d298acc16a1
parent48195e0575721bcf5f1ecebbb967d4bbf027b5c0
Merge pull request #70 from rsrdesarrollo/master

bad JSON syntax, and multi-usb not implemented