Greg Wilkins edcb56ae6b Merge remote-tracking branch 'origin/master' into jetty-http2 ... Conflicts: jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java		2014-08-29 12:41:52 +10:00
..
src	435322 Added a idleTimeout to the SharedBlockerCallback	2014-08-29 11:55:06 +10:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2014-07-23 11:18:01 -07:00