Greg Wilkins edcb56ae6b Merge remote-tracking branch 'origin/master' into jetty-http2 ... Conflicts: jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java		2014-08-29 12:41:52 +10:00
..
src	442759 Allow specific ServletContainerInitializers to be excluded	2014-08-28 16:52:26 +10:00
pom.xml	moved config plugin to profile	2014-08-15 19:53:52 +10:00