backport sync

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

diff --git a/CHANGES b/CHANGES
index 9a3bb09d7ba2a02ab42baed79e3740a84de56ac0..af25689ae6da5cbd4005536da68c4c01d70e6bf7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -94,9 +94,6 @@ Changes with Apache 2.1.0-dev
   *) Satisfy directives now can be influenced by a surrounding <Limit>
      container.  PR 14726.  [André Malo]
 
-  *) htpasswd: use apr_temp_dir_get() and general cleanup
-     [Guenter Knauf <eflash gmx.net>, Thom May]
-
   *) mod_proxy: Fix handling of non-200 success status codes when
      "ProxyErrorOverride On" is configured.  PR 20183.
      [Marcus Janson <marcus.janson tre.se>, Joe Orton]
@@ -361,6 +358,9 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.50
 
+  *) htpasswd: use apr_temp_dir_get() and general cleanup
+     [Guenter Knauf <eflash gmx.net>, Thom May]
+
   *) mod_ssl: Fix memory leak in session cache handling.  PR 26562
      [Madhusudan Mathihalli]