* Sync with 2.2.x CHANGES file

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

diff --git a/CHANGES b/CHANGES
index 45cdaab7b0844330db7656713516c655b79bc311..8e7797f74fa187fb4a96d8dea21d736477d80a9a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -8,12 +8,6 @@ Changes with Apache 2.3.0
 
   *) mod_headers: support regexp-based editing of HTTP headers [Nick Kew]
 
-  *) mod_echo: Fix precedence problem in if statement. PR 40658.
-     [Larry Cipriani <lvc lucent.com>]
-
-  *) mod_mime_magic: Fix precedence problem in if statement. PR 40656.
-     [Larry Cipriani <lvc lucent.com>]
-
   *) mod_cache: Eliminate a bogus error in the log when a filter returns
      AP_FILTER_ERROR. [Niklas Edmundsson <nikke acc.umu.se>]
 
@@ -246,6 +240,12 @@ Changes with Apache 2.3.0
 
 Changes with Apache 2.2.4
 
+  *) mod_echo: Fix precedence problem in if statement. PR 40658.
+     [Larry Cipriani <lvc lucent.com>]
+
+  *) mod_mime_magic: Fix precedence problem in if statement. PR 40656.
+     [Larry Cipriani <lvc lucent.com>]
+
   *) The full server version information is now included in the error log at
      startup as well as server status reports, irrespective of the setting
      of the ServerTokens directive.  ap_get_server_version() is now