Greg Wilkins 070ce9dd22 Merge remote-tracking branch 'origin/master' into jetty-9.1 ... Conflicts: jetty-start/src/main/java/org/eclipse/jetty/start/Main.java jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java		2013-09-09 15:41:17 +10:00
..
src	Merge remote-tracking branch 'origin/master' into jetty-9.1	2013-09-09 15:41:17 +10:00
pom.xml	Fixing distribution - adding servlets.mod + javax.mail support	2013-09-06 07:53:35 -07:00