Greg Wilkins 8bda67b82d Merge remote-tracking branch 'origin/master' into jetty-9.1 ... Conflicts: jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java		2013-11-08 15:24:12 +11:00
..
src	Merge remote-tracking branch 'origin/master' into jetty-9.1	2013-11-08 15:24:12 +11:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2013-09-30 14:46:09 -05:00