Greg Wilkins 0f4a4cdac6 Merge remote-tracking branch 'origin/jetty-9.2.x' ... Conflicts: jetty-io/src/main/java/org/eclipse/jetty/io/FillInterest.java jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java		2014-12-05 08:11:54 +01:00
..
src	Merge remote-tracking branch 'origin/jetty-9.2.x'	2014-12-05 08:11:54 +01:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2014-12-03 09:00:57 -06:00