tree d8fa53226555d730664a4366e464d6515090d860
parent 7c882d76c5d6198cf142a224f2726487a7a0278f
parent e4454965d4ecdfefd4a2d3395ce3635808642157
author Jan Bartel <janb@intalio.com> 1409906173 +1000
committer Jan Bartel <janb@intalio.com> 1409906173 +1000

Merge branch 'apache-jsp-osgi' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into apache-jsp-osgi