From: Eric Covener <covener@apache.org>
Date: Sun, 25 Mar 2012 12:04:26 +0000 (+0000)
Subject: backported
X-Git-Tag: 2.5.0-alpha~7308
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e03cdf14e88fd74c4096817315219f649b532506;p=thirdparty%2Fapache%2Fhttpd.git

backported


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1305015 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 8d1b0fefa76..dc68b088428 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,9 +4,6 @@ Changes with Apache 2.5.0
   *) core: Fix breakage of Listen directives with MPMs that use a
      per-directory config. PR 52904. [Stefan Fritsch]
 
-  *) core: Fix merging of AllowOverrideList and ContentDigest.
-     [Stefan Fritsch]
-
   *) core: Disallow directives in AllowOverrideList which are only allowed
      in VirtualHost or server context. These are usually not prepared to be
      called in .htaccess files. [Stefan Fritsch]