Greg Wilkins 69bf5ab46c Merge remote-tracking branch 'origin/jetty-9.2.x' ... Conflicts: jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/HttpSpiContextHandler.java jetty-server/src/main/java/org/eclipse/jetty/server/handler/ErrorHandler.java jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java		2015-05-29 21:05:26 +10:00
..
java/org/eclipse/jetty/http/spi	Merge remote-tracking branch 'origin/jetty-9.2.x'	2015-05-29 21:05:26 +10:00
resources/META-INF/services	[Bug 348978] migrate jetty-http-spi	2011-10-07 11:37:33 -05:00