Greg Wilkins 8ff291d223 Merge remote-tracking branch 'origin/jetty-8' ... Conflicts: jetty-http/src/main/java/org/eclipse/jetty/http/HttpContent.java jetty-overlay-deployer/src/main/java/org/eclipse/jetty/overlays/OverlayedAppProvider.java jetty-overlay-deployer/src/main/java/org/eclipse/jetty/overlays/TemplateContext.java jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java jetty-server/src/main/java/org/eclipse/jetty/server/ResourceCache.java jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java jetty-server/src/test/java/org/eclipse/jetty/server/ResourceCacheTest.java jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/AbstractCompressedStream.java jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/CompressedResponseWrapper.java		2012-11-12 12:30:26 +11:00
..
main/java/org/eclipse/jetty/servlet	Merge remote-tracking branch 'origin/jetty-8'	2012-11-12 12:30:26 +11:00
test	Merge remote-tracking branch 'origin/jetty-8'	2012-11-12 12:30:26 +11:00