reflect a merge

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

diff --git a/CHANGES b/CHANGES
index 3c65a90791386f7ede6496aea5b045b0948ca46c..80189948ee3e525b7caaaa4687dc9818f6efba7b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -15,9 +15,6 @@ Changes with Apache 2.1.0-dev
   *) prefork MPM: Use the right permissions for the directory created 
      for gprof support.  [Jim Carlson <jcarlson@jnous.com>]
 
-  *) mod_log_config: Add the ability to log the id of the thread 
-     processing the request via new %P formats.  [Jeff Trawick]
-
   *) ssl_toolkit_compat.h and code fixes to build clean on SSLC.
      [William Rowe, Madhusudan Mathihalli]
 
@@ -153,6 +150,9 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.46
 
+  *) mod_log_config: Add the ability to log the id of the thread 
+     processing the request via new %P formats.  [Jeff Trawick]
+
   *) Use appropriate language code for Czech (cs) and Traditional Chinese
      (zh-tw) in default config files. PR 9427.  [André Malo]