Greg Wilkins 9d62229dec Merge remote-tracking branch 'origin/jetty-8' into jetty-9 ... Conflicts: jetty-security/src/main/java/org/eclipse/jetty/security/authentication/ClientCertAuthenticator.java jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DeferredAuthentication.java jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java jetty-security/src/main/java/org/eclipse/jetty/security/authentication/LoginAuthenticator.java jetty-security/src/main/java/org/eclipse/jetty/security/authentication/SessionAuthentication.java jetty-security/src/main/java/org/eclipse/jetty/security/authentication/SpnegoAuthenticator.java jetty-server/src/main/java/org/eclipse/jetty/server/Request.java		2012-10-15 12:15:44 +11:00
..
main	Merge remote-tracking branch 'origin/jetty-8' into jetty-9	2012-10-15 12:15:44 +11:00
test	Merge remote-tracking branch 'origin/jetty-8' into jetty-9	2012-10-12 21:19:21 +11:00