Update master

ysimonson · ysimonson · commit 6b4af052889f · 2012-06-25T10:32:42.000-07:00
diff --git a/doc/protocol.md b/doc/protocol.md
@@ -78,7 +78,7 @@ All events' header must contain an unique message id and the protocol version:
 
 	{
 		"message_id": "6ce9503a-bfb8-486a-ac79-e2ed225ace79",
-		v: 3
+		"v": 3
 	}
 
 The message id should be unique for the lifetime of the connection between a

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ All events' header must contain an unique message id and the protocol version:`
`78`	`78`
`79`	`79`	`{`
`80`	`80`	`"message_id": "6ce9503a-bfb8-486a-ac79-e2ed225ace79",`
`81`		`- v: 3`
	`81`	`+ "v": 3`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`The message id should be unique for the lifetime of the connection between a`