sync with APACHE_2_0_BRANCH

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

diff --git a/CHANGES b/CHANGES
index 4f6b0700dedfa13caa742a0e190a2ed1f9741007..e66750c4712a731a16c64e8ba70600aa5cefdd8f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -129,10 +129,6 @@ Changes with Apache 2.1.0-dev
   *) mod_cgid: Restart the cgid daemon if it crashes.  PR 19849
      [Glenn Nielsen <glenn@apache.org>]
 
-  *) Unix: Handle permissions settings for flock-based mutexes in 
-     unixd_set_global|proc_mutex_perms().  Allow the functions to be
-     called for any type of mutex.  PR 20312  [Jeff Trawick]
-
   *) Fix some broken log messages in WinNT MPM.  
      [Juan Rivera <Juan.Rivera@citrix.com>]
 
@@ -259,6 +255,10 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.48
 
+  *) Unix: Handle permissions settings for flock-based mutexes in 
+     unixd_set_global|proc_mutex_perms().  Allow the functions to be
+     called for any type of mutex.  PR 20312  [Jeff Trawick]
+
   *) ab: Work over non-loopback on Unix again. PR 21495. [Jeff Trawick]
 
   *) Fix a misleading message from the some of the threaded MPMs when