Greg Wilkins 2629f93397 Revert "Merge branch 'release-7' into jetty-7" ... This reverts commit 624a0d7e45, reversing changes made to 3eb84f99a4. Conflicts: VERSION.txt		2013-09-16 23:23:59 +10:00
..
src/main/resources	Rename jetty-jsp src/main/resource to src/main/resources	2012-02-09 08:15:59 +11:00
pom.xml	Revert "Merge branch 'release-7' into jetty-7"	2013-09-16 23:23:59 +10:00