Nikolay Volf 8cdb013f9f Merge branch 'master' into pv63-receipts ... Conflicts: ethcore/src/client/client.rs		2016-03-14 17:36:51 +01:00
..
src	Merge branch 'master' into pv63-receipts	2016-03-14 11:06:28 +01:00
Cargo.toml	Version 1.1	2016-03-14 01:00:17 +01:00
cov.sh	excluded test code from coverage	2016-02-05 02:01:29 +03:00