Merge branch 'master' into release-9
set for release
[maven-release-plugin] prepare release jetty-9.2.3.v20140821
[maven-release-plugin] prepare for next development iteration
reset for more dev
Switch to apache-jsp for jetty-osgi
Make annotations and JNDI wortk with OSGi
Switch to apache-jsp for jetty-osgi
Make annotations and JNDI wortk with OSGi
Merge branch 'apache-jsp-osgi' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into apache-jsp-osgi
Update versions of apache-jsp and servlet-api for osgi
Removed BenchmarkHelper in favour of the version present in the jetty-test-helper.
Fixed typo.
reset for release
Merge branch 'master' into release-9
set for release
[maven-release-plugin] prepare release jetty-9.2.3.v20140905
[maven-release-plugin] prepare for next development iteration
set for dev
Merge branch 'release-9'