Greg Wilkins a6e00bc642 Merge remote-tracking branch 'origin/jetty-9.2.x' ... Conflicts: jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java jetty-util/src/test/java/org/eclipse/jetty/util/resource/AbstractFSResourceTest.java		2014-10-30 14:36:50 +11:00
..
src	Merge remote-tracking branch 'origin/jetty-9.2.x'	2014-10-30 14:36:50 +11:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2014-10-28 14:20:30 -05:00