Greg Wilkins 3ded04813d Merge remote-tracking branch 'origin/master' into servlet-3.1-api ... Conflicts: jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/ServerHTTPSPDYTest.java		2013-06-21 11:22:58 +10:00
..
jetty-osgi-boot	Merge remote-tracking branch 'origin/master' into servlet-3.1-api	2013-06-17 16:29:39 +10:00
jetty-osgi-boot-jsp	Merge remote-tracking branch 'origin/master' into servlet-3.1-api	2013-06-17 16:29:39 +10:00
jetty-osgi-boot-warurl	Merge remote-tracking branch 'origin/master' into servlet-3.1-api	2013-06-17 16:29:39 +10:00
jetty-osgi-httpservice	Merge remote-tracking branch 'origin/master' into servlet-3.1-api	2013-06-17 16:29:39 +10:00
jetty-osgi-npn	[maven-release-plugin] prepare for next development iteration	2013-05-06 18:13:04 -05:00
test-jetty-osgi	Merge remote-tracking branch 'origin/master' into servlet-3.1-api	2013-06-17 16:29:39 +10:00
test-jetty-osgi-context	Merge remote-tracking branch 'origin/master' into servlet-3.1-api	2013-06-17 16:29:39 +10:00
test-jetty-osgi-webapp	Merge remote-tracking branch 'origin/master' into servlet-3.1-api	2013-06-17 16:29:39 +10:00
pom.xml	Merge remote-tracking branch 'origin/master' into servlet-3.1-api	2013-06-17 16:29:39 +10:00