jetty.project/jetty-websocket/src/test/java/org/eclipse/jetty/websocket
Jan Bartel 42475b1564 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
2013-02-26 12:50:30 +11:00
..
WebSocketMinVersionTest.java Fixing websocket testcase 2013-02-25 16:53:32 -07:00