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

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

30d62d644df162ef4de532b2358cccf31c1593d1