jetty.project/jetty-webapp
Jan Bartel 3d553e79a9 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
2013-05-29 11:05:09 +10:00
..
src Merge remote-tracking branch 'origin/jetty-8' 2013-05-29 11:05:09 +10:00
pom.xml Merge branch 'release-8' into jetty-8 2013-05-22 10:44:14 -05:00