Greg Wilkins 2e444d2f17 Merge remote-tracking branch 'origin/master' into jetty-9.1 ... Conflicts: jetty-io/src/main/java/org/eclipse/jetty/io/AbstractConnection.java jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyHTTPSPDYConnection.java		2013-09-02 17:00:07 +10:00
..
src	Merge remote-tracking branch 'origin/master' into jetty-9.1	2013-09-02 17:00:07 +10:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2013-08-15 19:13:27 +10:00