Greg Wilkins 086e74bed8 jetty-9 merged jetty-8 ... Merge remote-tracking branch 'origin/jetty-8' into jetty-9 Conflicts: jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java jetty-util/src/main/java/org/eclipse/jetty/util/log/StdErrLog.java jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarFileResource.java jetty-util/src/test/java/org/eclipse/jetty/util/log/StdErrLogTest.java		2012-08-17 23:35:42 +10:00
..
src	jetty-9 merged jetty-8	2012-08-17 23:35:42 +10:00
pom.xml	jetty-9 fixed bad merge of poms	2012-07-20 15:20:57 +10:00