Greg Wilkins b8e0258faf Merge remote-tracking branch 'origin/master' into jetty-8 ... Conflicts: jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelTimeoutTest.java		2012-01-12 11:01:03 +11:00
..
test-integration	Merge remote-tracking branch 'origin/master' into jetty-8	2012-01-12 11:01:03 +11:00
test-loginservice	Revert "Merge branch 'release-8'"	2011-11-30 16:27:30 +11:00
test-sessions	Revert "Merge branch 'release-8'"	2011-11-30 16:27:30 +11:00
test-webapps	clear up the last of the maven warnings I see	2012-01-10 13:45:39 -06:00
pom.xml	Revert "Merge branch 'release-8'"	2011-11-30 16:27:30 +11:00