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 8d1b0fefa764c15cca3a82ce7e53add748560e23..dc68b0884284875bc40d146781910d090743b061 100644 (file)
--- 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]