From: William A. Rowe Jr <wrowe@apache.org>
Date: Thu, 27 Jun 2013 17:31:21 +0000 (+0000)
Subject: Re-sort into the right release
X-Git-Tag: 2.2.25~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=018b046df2ad9443f9b4bdcf6f203ebbf728b2c4;p=thirdparty%2Fapache%2Fhttpd.git

Re-sort into the right release

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1497472 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index f4f25b6f3cb..0c1a8f9f2b4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -35,6 +35,9 @@ Changes with Apache 2.2.25
      admin to configure an IO timeout as an error in the balancer.
      [Daniel Ruggeri]
 
+  *) mod_authnz_ldap: Allow using exec: calls to obtain LDAP bind
+     password.  [Daniel Ruggeri]
+
   *) htdigest: Fix buffer overflow when reading digest password file
      with very long lines. PR 54893. [Rainer Jung]
 
@@ -119,9 +122,6 @@ Changes with Apache 2.2.24
   *) mod_ssl: Add new directive SSLCompression to disable TLS-level
      compression. PR 53219. [Björn Jacke <bjoern j3e de>, Stefan Fritsch]
 
-  *) mod_authnz_ldap: Allow using exec: calls to obtain LDAP bind
-     password.  [Daniel Ruggeri]
-
 Changes with Apache 2.2.23
 
   *) SECURITY: CVE-2012-0883 (cve.mitre.org)