move a couple of entries from the 2.1 section to the 2.0.45

section, since the code was subsequently merged into the
stable branch

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

diff --git a/CHANGES b/CHANGES
index 26414e4348699b4e0ed7d33e0c6682bfbf9d5eb9..5ee2ea605d3353d48677776e3638d274fc597255 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,16 +5,10 @@ Changes with Apache 2.1.0-dev
   *) Move RFC 1413 ident requests from core to new module mod_ident.
      [André Malo]
 
-  *) Fix the ulimit command used by apachectl on Tru64.  PR 13609.
-     [Joseph Senulis <Joseph.Senulis@dnr.state.wi.us>, Jeff Trawick]
-
   *) Add mod_authz_owner - a forward port of "Require file-owner"
      and "Require file-group", which was already present in version
      1.3.21.  [André Malo]
 
-  *) Change the ulimit command used by apachectl on AIX so that it
-     works in all locales.  [Jeff Trawick]
-
   *) Add mod_dav_lock - a generic subset of the DAV locking implementation.
      [Justin Erenkrantz]
 
@@ -71,6 +65,12 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.45
 
+  *) Fix the ulimit command used by apachectl on Tru64.  PR 13609.
+     [Joseph Senulis <Joseph.Senulis@dnr.state.wi.us>, Jeff Trawick]
+
+  *) Change the ulimit command used by apachectl on AIX so that it
+     works in all locales.  [Jeff Trawick]
+
   *) mod_ext_filter: Fix a problem building argument lists which 
      occasionally caused exec to fail.  PR 15491.  [Jeff Trawick]