Merge remote-tracking branch 'origin/jetty-8'

Conflicts: jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
2013-05-20 17:32:18 +10:00 · 2013-05-20 17:32:18 +10:00 · 8ceb61992b
parent b5f3743a22 259aac6463
commit 8ceb61992b
1 changed files with 0 additions and 1 deletions
--- a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
+++ b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
@ -168,7 +168,6 @@ public class MultipartFilterTest
        assertTrue(response.getContent().indexOf("brown cow")>=0);
    }

-
    @Test
    public void testEncodedPost() throws Exception
    {