Jan Bartel 346918577f Merge remote-tracking branch 'origin/jetty-8' ... Conflicts: jetty-client/src/main/java/org/eclipse/jetty/client/AsyncHttpConnection.java jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java jetty-server/src/main/java/org/eclipse/jetty/server/Server.java jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppContextTest.java test-jetty-servlet/src/main/java/org/eclipse/jetty/testing/ServletTester.java test-jetty-webapp/src/main/java/com/acme/CookieDump.java test-jetty-webapp/src/main/java/com/acme/HelloWorld.java		2012-12-22 15:12:17 +11:00
..
main	Merge remote-tracking branch 'origin/jetty-8'	2012-12-22 15:12:17 +11:00
test	Merge remote-tracking branch 'origin/jetty-8' into jetty-9	2012-10-12 21:19:21 +11:00