Greg Wilkins d2794584e1 Merge remote-tracking branch 'origin/master' into servlet-3.1-api ... Conflicts: jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java jetty-server/src/main/java/org/eclipse/jetty/server/Response.java		2013-06-07 15:48:22 +10:00
..
src	Updating Jetty XML use in jetty-deploy tests.	2013-06-03 11:34:38 -07:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2013-05-06 18:13:04 -05:00