Greg Wilkins 98b654ba20 Merge remote-tracking branch 'origin/master' into jetty-http2 ... Conflicts: jetty-distribution/pom.xml		2014-08-14 08:38:25 +10:00
..
async-rest	[maven-release-plugin] prepare for next development iteration	2014-07-23 11:18:01 -07:00
embedded	Merge remote-tracking branch 'origin/master' into jetty-http2	2014-08-14 08:38:25 +10:00
quickstart	Merge remote-tracking branch 'origin/master' into jetty-http2	2014-07-25 17:37:53 +10:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2014-07-23 11:18:01 -07:00