Merge branch 'qt5.4' of github.com-obscure:ethereum/go-ethereum into qt5.4

Conflicts:
	rpc/message.go

1 files changed, 0 insertions, 15 deletions

diff --git a/websocket/message.go b/websocket/message.go
deleted file mode 100644
index cd2af5099..000000000
--- a/websocket/message.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package websocket
-
-import "github.com/ethereum/go-ethereum/ethutil"
-
-type Message struct {
-	Call  string        `json:"call"`
-	Args  []interface{} `json:"args"`
-	Id    int           `json:"_id"`
-	Data  interface{}   `json:"data"`
-	Event string        `json:"_event"`
-}
-
-func (self *Message) Arguments() *ethutil.Value {
-	return ethutil.NewValue(self.Args)
-}