Nikolay Volf ade8b8356b Merge branch 'master' into pv63-state ... Conflicts: ethcore/src/client/client.rs		2016-03-12 18:09:45 +01:00
..
res	Update tests. Fix our tests.	2016-03-01 20:02:59 +01:00
src	Merge branch 'master' into pv63-state	2016-03-12 18:09:45 +01:00
Cargo.toml	Merge branch 'master' into updating_clippy	2016-03-11 19:17:09 +01:00