Merge ethereum/poc-9 into accounts-integration

Conflicts:
	cmd/utils/cmd.go
	cmd/utils/flags.go
	core/manager.go
	eth/backend.go
	rpc/http/server.go
	xeth/xeth.go
This commit is contained in:
Felix Lange
2015-03-09 23:25:46 +01:00
84 changed files with 25638 additions and 6387 deletions

View File

@ -36,7 +36,7 @@ import (
const (
ClientIdentifier = "Mist"
Version = "0.8.6"
Version = "0.9.0"
)
var (