Robert Habermeier e88c62d37d Merge branch 'master' into better-timeouts		2017-01-11 18:55:16 +01:00
..
src	Merge branch 'master' into better-timeouts	2017-01-11 18:55:16 +01:00
build.rs	Rename ethcore -> parity in license.	2016-12-11 19:30:54 +01:00
Cargo.toml	v1.6 in master (#4113)	2017-01-10 15:41:59 +01:00