Backport done.

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

diff --git a/CHANGES b/CHANGES
index b73e80e4d586b14ce155533e58e1c18bb873be1c..43394cbe915433ea3eaafd2cee847ad456fd72ee 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -105,11 +105,6 @@ Changes with Apache 2.1.0-dev
   *) Add support for IMT minor-type wildcards (e.g., text/*) to
      ExpiresByType.  PR#7991  [Ken Coar]
 
-  *) Ensure that ssl-std.conf is generated at configure time, and switch
-     to using the expanded config variables to work the same as
-     httpd-std.conf PR 19611
-     [Thom May]
-
   *) Fix a problem with namespace mappings being dropped in mod_dav_fs; 
      if any property values were set which defined namespaces these 
      came out mangled in the PROPFIND response.  PR 11637.
@@ -225,6 +220,11 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.48
 
+  *) Ensure that ssl-std.conf is generated at configure time, and switch
+     to using the expanded config variables to work the same as
+     httpd-std.conf PR 19611
+     [Thom May]
+
   *) mod_ssl: Fix segfaults after renegotiation failure. PR 21370
      [Hartmut Keil <Hartmut.Keil@adnovum.ch>]