From: Ruediger Pluem <rpluem@apache.org>
Date: Sat, 1 Sep 2007 17:07:41 +0000 (+0000)
Subject: * Add a comment
X-Git-Tag: 2.2.6~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=804ea35e8205a3f5e8110739ce7557ab668e6b06;p=thirdparty%2Fapache%2Fhttpd.git

* Add a comment


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

diff --git a/STATUS b/STATUS
index bbea4e2084f..7b2e9e40930 100644
--- a/STATUS
+++ b/STATUS
@@ -120,6 +120,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
             http://svn.apache.org/viewvc?view=rev&revision=571798
             http://svn.apache.org/viewvc?view=rev&revision=571804
      +1: minfrin
+     rpluem says: r466865 has a conflict in modules/aaa/mod_auth.h
+                  r571804 has a conflict in docs/manual/mod/mod_authnz_ldap.xml
 
    * beos MPM: Create pmain pool and run modules' child_init hooks when
      entering ap_mpm_run(), then destroy pmain when exiting ap_mpm_run().