[auto] Merge from Websocket
[auto] Merge from Websocket

    • #3e6b494 — Revert previous commit. #oops (Ivan Enderlin, 2013-03-12)

---

Merge remote branch 'library-websocket/master'

vcgato29/Central,Grummfy/Central,Metalaka/Central,Grummfy/Central,vcgato29/Central,Metalaka/Central