From: Stefan Eissing <icing@apache.org>
Date: Mon, 18 Mar 2019 08:52:02 +0000 (+0000)
Subject: update after backport
X-Git-Tag: 2.4.39~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f3def3342001a54bb79831ef52d24955e16289d8;p=thirdparty%2Fapache%2Fhttpd.git

update after backport

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1855739 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index ffa30bf5823..823db322088 100644
--- a/STATUS
+++ b/STATUS
@@ -146,11 +146,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      +1: jim, ylavic, covener
      jailletc36: require r1818321 and part of r1818341 to update doc accordingly
 
-   *) core: merge consecutive slashes in the path
-      trunk patch http://svn.apache.org/r1855705
-      2.4.x patch: http://people.apache.org/~covener/patches/mergeslashes-2.4.diff
-      +1: covener, rpluem, icing
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]