Merge branch 'develop' into release/1.4

Conflicts:
	cmd/geth/main.go
This commit is contained in:
Jeffrey Wilcke
2016-05-03 13:52:58 +02:00
42 changed files with 2495 additions and 545 deletions

View File

@@ -1 +1 @@
1.4.0
1.4.1