Andy Wilkinson 0f998e2ae1 Merge branch '1.5.x'

2017-01-24 12:39:45 +00:00

..

main

Avoid synchronizing on this and use an internal monitor instead

2016-07-01 10:44:23 +01:00

test/java/samples/websocket/jetty

Merge branch '1.5.x'

2017-01-24 12:39:45 +00:00