Re-synch with 2.0 stable branch after backport.

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

diff --git a/CHANGES b/CHANGES
index ae99db5bbc9dba95739a0d1d6f57f00498af6c75..753a5ea45f678208ac3223c8b6f83436d3b69f46 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -172,9 +172,6 @@ Changes with Apache 2.1.0-dev
   *) Fix some broken log messages in WinNT MPM.  
      [Juan Rivera <Juan.Rivera citrix.com>]
 
-  *) Add support for IMT minor-type wildcards (e.g., text/*) to
-     ExpiresByType.  PR#7991  [Ken Coar]
-
   *) prefork MPM: Use the right permissions for the directory created 
      for gprof support.  [Jim Carlson <jcarlson jnous.com>]
 
@@ -275,6 +272,9 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.49
 
+  *) Add support for IMT minor-type wildcards (e.g., text/*) to
+     ExpiresByType.  PR#7991  [Ken Coar]
+
   *) Fix segfault in mod_mem_cache cache_insert() due to cache size
      becoming negative.  PR: 21285, 21287
      [Bill Stoddard, Massimo Torquati, Jean-Jacques Clar]