Jan Bartel 32e1d0f29c Merge remote-tracking branch 'origin/jetty-7' into jetty-8 ... Conflicts: jetty-server/src/main/java/org/eclipse/jetty/server/Server.java jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java		2012-12-21 13:00:14 +11:00
..
src	Merge remote-tracking branch 'origin/jetty-7' into jetty-8	2012-12-21 13:00:14 +11:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2012-11-05 12:24:06 -06:00