Jan Bartel 8e0dc72b23 Merge remote-tracking branch 'origin/master' into jetty-8 ...

Conflicts:
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleDeployerHelper.java
	jetty-osgi/jetty-osgi-servletbridge/pom.xml
	jetty-osgi/pom.xml

2012-07-23 13:24:57 +10:00

..

src

Merge remote-tracking branch 'origin/master' into jetty-8

2012-07-23 13:24:57 +10:00

pom.xml

[maven-release-plugin] prepare for next development iteration

2012-07-16 13:24:49 -05:00