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/main/resources	Rename jetty-jsp src/main/resource to src/main/resources	2012-02-09 08:15:59 +11:00
pom.xml	Merge remote-tracking branch 'origin/master' into servlet-3.1-api	2013-06-17 16:29:39 +10:00