Greg Wilkins 48b6bec64c Merge remote-tracking branch 'origin/jetty-9.2.x' ... Conflicts: jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java		2015-03-05 20:17:20 +11:00
..
src	Merge remote-tracking branch 'origin/jetty-9.2.x'	2015-03-05 20:17:20 +11:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2015-02-24 10:38:33 -06:00