Greg Wilkins fa3d7d0f7e Merge remote-tracking branch 'origin/master' into jetty-http2 ... Conflicts: jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextDispatchWithQueryStrings.java		2014-07-23 16:53:13 +10:00
..
src/main/java/org/eclipse/jetty/maven/plugin	expanded tabs in indents	2014-07-23 16:49:05 +10:00
.gitignore	adding in jetty-maven-plugin	2012-08-28 09:35:45 -05:00
pom.xml	Merge remote-tracking branch 'origin/master' into jetty-http2	2014-07-10 14:43:39 +10:00