jetty.project/jetty-server
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 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-06-07 15:48:22 +10:00
pom.xml Update to version to 8.1.12-SNAPSHOT after last release 2013-05-30 10:52:39 +10:00