* 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 bbea4e2084f228fc1ff45b7b7fe63a3548018ea3..7b2e9e4093030f833862cd7b8382543b2f0ec752 100644 (file)
--- 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().