jetty.project/tests/test-integration/src/test
Greg Wilkins 3efcc2af41 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
2013-01-10 16:24:41 +11:00
..
java/org/eclipse/jetty/test Merge remote-tracking branch 'origin/jetty-8' 2013-01-10 16:24:41 +11:00
resources Merge remote-tracking branch 'origin/jetty-8' 2013-01-07 12:47:32 +11:00