Jan Bartel 90b5ea2c5e Merge remote-tracking branch 'origin/jetty-8' ... Conflicts: jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletContainerInitializerListener.java jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java		2013-03-01 19:08:09 +11:00
..
src	Merge remote-tracking branch 'origin/jetty-8'	2013-03-01 19:08:09 +11:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2013-02-26 09:20:45 -07:00