Tomasz Drwięga 77d526fd0b Merge branch 'master' into tx_queue_integration ...

Conflicts:
	ethcore/src/client.rs
	sync/src/tests/helpers.rs

2016-03-05 00:57:45 +01:00

..

src

Merge branch 'master' into tx_queue_integration

2016-03-05 00:57:45 +01:00

Cargo.toml

Merge branch 'master' into tx_queue_integration

2016-03-05 00:57:45 +01:00

cov.sh

excluded test code from coverage

2016-02-05 02:01:29 +03:00