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

..

external.rs

…

miner.rs

Merge branch 'master' into auth-round

2016-09-19 14:35:44 +02:00

mod.rs

…

price_info.rs

…

transaction_queue.rs

…

work_notify.rs

…