Joakim Erdfelt ed594425d3 Merge branch 'jetty-9.2.x' ... Conflicts: jetty-server/src/main/config/etc/jetty.xml jetty-server/src/main/config/modules/server.mod jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java jetty-server/src/main/java/org/eclipse/jetty/server/HttpConfiguration.java jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java		2014-11-25 12:09:21 -07:00
..
src	Merge branch 'jetty-9.2.x'	2014-11-25 12:09:21 -07:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2014-11-12 17:13:19 -06:00