Greg Wilkins 74edf1867c Merge remote-tracking branch 'origin/jetty-7' into jetty-8 ... Conflicts: tests/test-integration/src/test/java/org/eclipse/jetty/test/jsp/JspAndDefaultWithoutAliasesTest.java		2013-01-10 12:06:55 +11:00
..
src	Merge remote-tracking branch 'origin/jetty-7' into jetty-8	2013-01-10 12:06:55 +11:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2012-11-05 12:24:06 -06:00