sync with APACHE_2_0_BRANCH

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

diff --git a/CHANGES b/CHANGES
index 90f9a3c3a53d4045b91da2f43638d47c7cf952d4..4f6b0700dedfa13caa742a0e190a2ed1f9741007 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -76,8 +76,6 @@ Changes with Apache 2.1.0-dev
   *) mod_rewrite: RewriteRules in server context using the force
      type feature [T=...] no longer disable MultiViews.  [André Malo]
 
-  *) ab: Work over non-loopback on Unix again. PR 21495. [Jeff Trawick]
-
   *) mod_rewrite: In external rewrite maps lookup keys containing
      a newline now cause a lookup failure. PR 14453.
      [Cedric Gavage <cedric.gavage@unixtech.be>, André Malo]
@@ -261,6 +259,8 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.48
 
+  *) ab: Work over non-loopback on Unix again. PR 21495. [Jeff Trawick]
+
   *) Fix a misleading message from the some of the threaded MPMs when 
      MaxClients has to be lowered due to the setting of ServerLimit.  
      [Jeff Trawick]