Jan Bartel e95301b906 Merge remote-tracking branch 'origin/jetty-8' ... Conflicts: jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ProxyServletTest.java jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketFactory.java jetty-websocket/src/test/java/org/eclipse/jetty/websocket/helper/SafariD00.java		2013-02-22 18:37:29 +11:00
..
src	Merge remote-tracking branch 'origin/jetty-8'	2013-02-22 18:37:29 +11:00
.gitignore	Adding tests for Named Logging	2011-08-24 09:31:28 -07:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2013-02-05 10:00:36 -07:00