Joakim Erdfelt a32c9ed79c Merge branch 'jetty-9.2.x' ... Conflicts: jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java jetty-start/src/main/java/org/eclipse/jetty/start/Main.java jetty-start/src/main/java/org/eclipse/jetty/start/Module.java		2015-02-23 18:05:19 -07:00
..
src	Merge branch 'jetty-9.2.x'	2015-02-23 18:05:19 -07:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2015-02-17 16:02:22 -06:00