jetty.project/jetty-servlet/src
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
..
main/java/org/eclipse/jetty/servlet Merge remote-tracking branch 'origin/jetty-8' 2013-02-26 12:50:30 +11:00
test Merge remote-tracking branch 'origin/jetty-8' 2013-01-15 20:35:46 +11:00