Greg Wilkins 4e4ffaa54c Merge remote-tracking branch 'origin/master' into servlet-3.1-api ... Conflicts: jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java		2013-06-17 16:29:39 +10:00
..
src	Merge remote-tracking branch 'origin/jetty-8'	2013-06-17 13:13:59 +10:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2013-05-06 18:13:04 -05:00