Jan Bartel 42475b1564 Merge remote-tracking branch 'origin/jetty-8' ... Conflicts: jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java		2013-02-26 12:50:30 +11:00
..
src	Merge remote-tracking branch 'origin/jetty-8'	2013-02-26 12:50:30 +11:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2013-02-05 10:00:36 -07:00