Merge history of 1.7.x and 0.9.x branches#2930

darrachequesne merged 1 commit intosocketio:mastersocketio/socket.io:masterfrom

darrachequesne:docs/historydarrachequesne/socket.io:docs/historyCopy head branch name to clipboard