Tomusdrw 6b0cc0c8fa Merge branch 'master' into close_gently ... Conflicts: parity/main.rs		2016-02-10 13:13:04 +01:00
..
res	Correct node id for bootnode.	2016-02-08 16:57:57 +01:00
src	Merge branch 'master' into close_gently	2016-02-10 13:13:04 +01:00
Cargo.toml	removing unused functions in progress	2016-02-02 23:06:34 +01:00