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

pom.xml

[maven-release-plugin] prepare for next development iteration

2013-06-25 08:29:26 -07:00

prodDb.properties

just fix a messed up git mv

2012-10-18 09:21:42 -05:00

prodDb.script

just fix a messed up git mv

2012-10-18 09:21:42 -05:00