Joakim Erdfelt 8636c7da45 Merge branch 'master' into jetty-9.1 ... Conflicts: jetty-maven-plugin/pom.xml pom.xml		2013-08-05 09:53:48 -07:00
..
test-continuation	Merge remote-tracking branch 'origin/master' into jetty-9.1	2013-07-04 17:28:57 +10:00
test-integration	Merge branch 'jetty-8'	2013-08-05 08:47:24 -07:00
test-loginservice	[maven-release-plugin] prepare for next development iteration	2013-07-26 11:50:17 -05:00
test-sessions	[maven-release-plugin] prepare for next development iteration	2013-07-26 11:50:17 -05:00
test-webapps	413018 ServletContext.addListener() should throw IllegalArgumentException if arg is not correct type of listener	2013-08-02 12:26:54 +10:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2013-07-26 11:50:17 -05:00