sync with stable branch

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

diff --git a/CHANGES b/CHANGES
index b012cf9e9b70ec111211db2251548946c691bec0..493215591c8abaaaac98f780e69434c8533b588c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -102,11 +102,6 @@ Changes with Apache 2.1.0-dev
      directory, display the MPM name and some MPM properties.
      [Geoffrey Young <geoff apache.org>]
 
-  *) Add fatal exception hook for use by diagnostic modules.  The hook
-     is only available if the --enable-exception-hook configure parm 
-     is used and the EnableExceptionHook directive has been set to 
-     "on".  [Jeff Trawick]
-
   *) mod_ssl/mod_status: Re-enable support for output of SSL session
      cache information in server-status page.  [Joe Orton]
 
@@ -282,6 +277,11 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.49
 
+  *) Add fatal exception hook for use by diagnostic modules.  The hook
+     is only available if the --enable-exception-hook configure parm 
+     is used and the EnableExceptionHook directive has been set to 
+     "on".  [Jeff Trawick]
+
   *) Allow mod_auth_digest to work with sub-requests with different
      methods than the original request.  PR 25040.
      [Josh Dady <jpd indecisive.com>]