Jan Bartel 59ada108b2 Merge remote-tracking branch 'origin/jetty-8' ... Conflicts: jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java jetty-client/src/test/java/org/eclipse/jetty/client/ExternalSiteTest.java jetty-client/src/test/java/org/eclipse/jetty/client/SslBytesServerTest.java jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslConnection.java jetty-io/src/test/java/org/eclipse/jetty/io/nio/SelectChannelEndPointSslTest.java jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ProxyServletTest.java jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceTest.java jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java test-jetty-webapp/pom.xml		2013-02-22 12:47:02 +11:00
..
src	Merge remote-tracking branch 'origin/jetty-8'	2013-02-22 12:47:02 +11:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2013-02-05 10:00:36 -07:00