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

    • #d399300 — Format a comment. #mania (Ivan Enderlin, 2013-03-15)

---

Merge remote branch 'library-websocket/master'

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