Tomasz Drwięga c3a79c1478 Merge branch 'master' into ethminer_crate ... Conflicts: ethcore/src/client/client.rs parity/main.rs sync/src/chain.rs sync/src/lib.rs		2016-03-11 19:22:40 +01:00
..
main.rs	Merge branch 'master' into ethminer_crate	2016-03-11 19:22:40 +01:00