Greg Wilkins e1faa5c1e9 Merge remote-tracking branch 'origin/jetty-9.2.x' ... Conflicts: jetty-util/src/main/java/org/eclipse/jetty/util/IO.java jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceTest.java		2015-07-23 11:34:59 +10:00
..
src	Merge remote-tracking branch 'origin/jetty-9.2.x'	2015-07-23 11:34:59 +10:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2015-07-14 11:42:34 -05:00