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

Conflicts:
	VERSION.txt
	jetty-osgi/jetty-osgi-boot-logback/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/WebEquinoxToolsActivator.java
	pom.xml

2011-08-01 14:39:39 +10:00

..

src

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

2011-08-01 14:39:39 +10:00

pom.xml

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

2011-07-07 18:43:56 -05:00