keorn 49fba0b548 Merge branch 'master' into auth-round ... Conflicts: ethcore/src/miner/miner.rs sync/Cargo.toml		2016-09-19 14:35:44 +02:00
..
res	new test_net holding Client	2016-09-13 15:58:32 +02:00
src	Merge branch 'master' into auth-round	2016-09-19 14:35:44 +02:00
build.rs	Snapshot sync (#2047)	2016-09-06 15:31:13 +02:00
Cargo.toml	Bump clippy & Fix warnings (#2109)	2016-09-16 23:03:26 +02:00