merge

3 files changed, 7 insertions, 2 deletions

diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go
index e4070aa47..3f9a2a838 100644
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@@ -31,7 +31,7 @@ import (
 
 const (
 	ClientIdentifier = "Ethereum(G)"
-	Version          = "0.7.10"
+	Version          = "0.7.11"
 )
 
 var clilogger = logger.NewLogger("CLI")
diff --git a/cmd/mist/main.go b/cmd/mist/main.go
index 72e77940d..6f578ff48 100644
--- a/cmd/mist/main.go
+++ b/cmd/mist/main.go
@@ -31,7 +31,7 @@ import (
 
 const (
 	ClientIdentifier = "Mist"
-	Version          = "0.7.10"
+	Version          = "0.7.11"
 )
 
 var ethereum *eth.Ethereum
diff --git a/cmd/utils/websockets.go b/cmd/utils/websockets.go
index 29f9b8aeb..e4bc1b185 100644
--- a/cmd/utils/websockets.go
+++ b/cmd/utils/websockets.go
@@ -3,10 +3,13 @@ package utils
 import (
 	"github.com/ethereum/go-ethereum/eth"
 	"github.com/ethereum/go-ethereum/ethutil"
+	"github.com/ethereum/go-ethereum/logger"
 	"github.com/ethereum/go-ethereum/websocket"
 	"github.com/ethereum/go-ethereum/xeth"
 )
 
+var wslogger = logger.NewLogger("WS")
+
 func args(v ...interface{}) []interface{} {
 	return v
 }
@@ -106,6 +109,8 @@ func (self *WebSocketServer) Serv() {
 }
 
 func StartWebSockets(eth *eth.Ethereum) {
+	wslogger.Infoln("Starting WebSockets")
+
 	sock := NewWebSocketServer(eth)
 	go sock.Serv()
 }