Jan Bartel 2acdf9f839 Merge remote-tracking branch 'origin/jetty-8' ... Conflicts: jetty-client/src/test/java/org/eclipse/jetty/client/WebSocketUpgradeTest.java jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionD00.java jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketFactory.java jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketServlet.java jetty-websocket/src/test/java/org/eclipse/jetty/websocket/SafariWebsocketDraft0Test.java jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketLoadD08Test.java jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketLoadRFC6455Test.java jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageD00Test.java jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageD06Test.java jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageD08Test.java jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketServletRFCTest.java		2012-11-05 17:27:49 +11:00
..
src	Merge remote-tracking branch 'origin/jetty-8'	2012-11-05 17:27:49 +11:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2012-09-10 14:18:11 -05:00