Greg Wilkins 3d3b035b22 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 ... Conflicts: jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java		2012-11-12 09:08:53 +11:00
..
logs	341992 Overlayed context deployer	2011-04-06 09:30:00 +00:00
src	Merge remote-tracking branch 'origin/jetty-7' into jetty-8	2012-11-12 09:08:53 +11:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2012-11-05 12:24:06 -06:00