Oops, forget to push this commit.
[auto] Merge from Websocket

    • #00e69a6 — Oops, forget to push this commit. (Ivan Enderlin, 2013-04-08)

---

Merge remote branch 'library-websocket/master'