From: Michael Jumper <zhangmaike@users.sourceforge.net>
Date: Fri, 9 Mar 2012 20:33:37 +0000 (-0800)
Subject: Merge branch 'loadable-websocket-support' into unstable
X-Git-Url: http://git.alex.org.uk

Merge branch 'loadable-websocket-support' into unstable
---

b2099e46a4ce65bd46b4da985936f970fbf42781