Greg Wilkins 5507e267ae Merge remote-tracking branch 'origin/master' into jetty-http2 ... Conflicts: jetty-server/src/main/config/etc/jetty-https.xml jetty-server/src/main/config/modules/ssl.mod jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java		2014-08-29 15:49:25 +10:00
..
src	Merge remote-tracking branch 'origin/master' into jetty-http2	2014-08-29 15:49:25 +10:00
pom.xml	cleaned up OSGi manifest creation	2014-08-15 19:35:49 +10:00