From: Ruediger Pluem <rpluem@apache.org>
Date: Sun, 20 Nov 2005 10:22:04 +0000 (+0000)
Subject: * Sync with 2.2.x CHANGES
X-Git-Tag: 2.3.0~2734
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91a26e8994714d469d34b6673f7f8295c08d5724;p=thirdparty%2Fapache%2Fhttpd.git

* Sync with 2.2.x CHANGES


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

diff --git a/CHANGES b/CHANGES
index 07dfcf7cd96..06c597bc256 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,10 +2,6 @@
 Changes with Apache 2.3.0
   [Remove entries to the current 2.0 and 2.2 section below, when backported]
 
-  *) mod_negotiation: Minor performance tweak by reusing already calculated
-     strlen.
-     [Ruediger Pluem, Christophe Jaillet <christophe.jaillet wanadoo.fr>]
-
   *) mod_authz_dbd: SQL authz with Login/Session support [Nick Kew]
 
   *) Fix typo in ProxyStatus syntax error message.
@@ -42,6 +38,10 @@ Changes with Apache 2.3.0
 
 Changes with Apache 2.1.10
 
+  *) mod_negotiation: Minor performance tweak by reusing already calculated
+     strlen.
+     [Ruediger Pluem, Christophe Jaillet <christophe.jaillet wanadoo.fr>]
+
   *) Remove support for 'On' and 'Off' for AuthBasicProvider and
      AuthDigestProvider.  [Joshua Slive, Justin Erenkrantz]