Merge with master

2016-06-29 14:46:29 +02:00
parent 3850ee64bb
commit 49024a4f28
235 changed files with 36456 additions and 4814 deletions
--- a/devtools/Cargo.toml
+++ b/devtools/Cargo.toml
@@ -3,7 +3,7 @@ description = "Ethcore development/test/build tools"
 homepage = "http://ethcore.io"
 license = "GPL-3.0"
 name = "ethcore-devtools"
-version = "1.2.0"
+version = "1.3.0"
 authors = ["Ethcore <admin@ethcore.io>"]

 [dependencies]