Greg Wilkins d8b1d80e4e Merge remote-tracking branch 'origin/master' into jetty-8 ... Conflicts: jetty-spdy/spdy-jetty-http-webapp/pom.xml jetty-spdy/spdy-jetty-http/pom.xml jetty-spdy/spdy-jetty/pom.xml		2012-03-19 17:22:02 +11:00
..
src	Merge remote-tracking branch 'origin/master' into jetty-8	2012-03-19 17:22:02 +11:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2012-03-08 23:53:50 -06:00