Greg Wilkins 2aab780eba Merge remote-tracking branch 'origin/jetty-7' into jetty-8 ...

Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
	tests/test-integration/src/test/java/org/eclipse/jetty/test/jsp/JspMatchingTest.java

2013-01-07 23:45:38 +11:00

..

src

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

2013-01-07 23:45:38 +11:00

jetty-chat.jmx

renamed non runtime modules

2009-05-26 01:16:27 +00:00

pom.xml

Merge branch 'jetty-7' into jetty-8

2012-12-27 14:22:57 -07:00