commit | 040a9f5c11ebdba2157f11907b67a0db8924df56 | [log] [tgz] |
---|---|---|
author | Jan Bartel <janb@intalio.com> | Fri Jun 28 15:44:00 2013 +1000 |
committer | Jan Bartel <janb@intalio.com> | Fri Jun 28 15:44:00 2013 +1000 |
tree | 5487d508e66a2d2ae9f5181abd122071505e5541 | |
parent | 73774c6894635b2754da1ee1989bc612e9f368be [diff] | |
parent | a639dbb4a4c9cd34469ca81165128e905c85fe99 [diff] |
Merge branch 'jetty-9' Remake master as jetty-9 Conflicts: README jetty.bundles.f.source/feature.xml jetty.bundles.f.source/pom.xml jetty.bundles.f/feature.xml jetty.bundles.f/pom.xml jetty.bundles.repo/pom.xml jetty.bundles.repo/site.xml pom.xml