Jan Bartel 232eb4491a Merge remote-tracking branch 'origin/jetty-8' ...

Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java

2013-06-17 13:13:59 +10:00

..

src/main/java/org/eclipse/jetty/maven/plugin

Merge remote-tracking branch 'origin/jetty-8'

2013-06-17 13:13:59 +10:00

.gitignore

adding in jetty-maven-plugin

2012-08-28 09:35:45 -05:00

pom.xml

[maven-release-plugin] prepare for next development iteration

2013-05-06 18:13:04 -05:00