Greg Wilkins d2ff475834 Merge remote-tracking branch 'origin/jetty-8' ... Conflicts: jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java jetty-util/src/main/java/org/eclipse/jetty/util/resource/FileResource.java tests/test-webapps/test-jetty-webapp/src/main/config/webapps.demo/test.xml		2013-08-23 17:17:34 +10:00
..
src	Merge remote-tracking branch 'origin/jetty-8'	2013-08-23 17:17:34 +10:00
.gitignore	Adding tests for Named Logging	2011-08-24 09:31:28 -07:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2013-07-26 11:50:17 -05:00