sync with 2.0.49-dev

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

diff --git a/CHANGES b/CHANGES
index 43030455738274af296d0381ae8fa085fe58d8ed..71c028e47f5d378c2123424d1a1e1074d368f599 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -64,9 +64,6 @@ Changes with Apache 2.1.0-dev
      true if the pattern is a file with execution permissions.
      [André Malo]
 
-  *) mod_log_config: Fix corruption of buffered logs with threaded
-     MPMs.  PR 25520.  [Jeff Trawick]
-
   *) Allow proxying of resources that are invoked via DirectoryIndex.
      PR 14648.  [André Malo]
 
@@ -281,6 +278,9 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.49
 
+  *) mod_log_config: Fix corruption of buffered logs with threaded
+     MPMs.  PR 25520.  [Jeff Trawick]
+
   *) Fix mod_include's expression parser to recognize strings correctly
      even if they start with an escaped token.  [André Malo]