Completed web socket unit tests. Fixed bugs.
Woohoo on to doco.
Merge branch 'master' into jython
Began work on api documentation generation and added credits to Tim Fox.
Added docs and test to build.xml
Added docs and test to build.xml
Merge branch 'jython' of github.com:sjhorn/vert.x into jython
Added python.path to testing target to ensure python tests work via ant.
minor tweak
https://github.com/purplefox/vert.x/issues/194
removed unnecessary check
Merge pull request #214 from adamhathcock/master

Issue with JsonObject.toMap with JsonArray
moved json test to proper place
removed vertx start deploy stop
don't swallow channel closed / connection reset by peer messages on http server
Fixed incorrect formatter class name.
Merge pull request #223 from benevans/patch-1

Fixed incorrect formatter class name.
Fixed NPE in session shutdown with webosockets
Merge branch 'master' of github.com:purplefox/vert.x
upgraded rhino to 1.7R4
upgraded to version 1.1.0.final