Merge branch 'master' into dev

HISTORY.md

@@ -1,3 +1,9 @@
+v0.6.1 (2014-8-25)
+-----------
+* bugfix: datacenter.wakeup
+* change struct msg name to avoid conflict in mac
+* improve seri library
+
 v0.6.0 (2014-8-18)
 -----------
 * add sharedata

lualib/socket.lua

@@ -145,6 +145,8 @@ local function connect(id, func)
 	suspend(s)
 	if s.connected then
 		return id
+	else
+		socket_pool[id] = nil
 	end
 end