3 Commits

Author SHA1 Message Date
Greg Wilkins
277ca5c065 fixed merge 2014-08-29 17:54:28 +10:00
Greg Wilkins
dacc796831 Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
	tests/test-quickstart/pom.xml
2014-08-29 17:52:58 +10:00
Greg Wilkins
17c9a32268 moved quickstart to test-quickstart 2014-08-29 17:35:26 +10:00