Joakim Erdfelt e2d872fcc7 Merge branch 'jetty-8' ... Conflicts: jetty-server/src/main/java/org/eclipse/jetty/server/handler/RequestLogHandler.java jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java jetty-spdy/spdy-client/pom.xml jetty-spdy/spdy-core/pom.xml jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java pom.xml tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/JmxServiceTest.java tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/ProgramConfigTest.java tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/XmlConfigTest.java		2013-08-05 08:47:24 -07:00
..
src/test	Merge branch 'jetty-8'	2013-08-05 08:47:24 -07:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2013-07-26 11:50:17 -05:00