Nikolay Volf 8cdb013f9f Merge branch 'master' into pv63-receipts ... Conflicts: ethcore/src/client/client.rs		2016-03-14 17:36:51 +01:00
..
client.rs	Merge branch 'master' into pv63-receipts	2016-03-14 17:36:51 +01:00
helpers.rs	Fixups for new API.	2016-03-11 15:07:43 +01:00
mod.rs	returning client to the place it should be, cleanup	2016-02-09 00:54:33 +03:00