* Add a comment

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

diff --git a/STATUS b/STATUS
index d19f1d5ec5bacf4c590d5f4f211b993ca52f8190..f356408ee940e2d41c6ed40d534d2741b034624f 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -272,6 +272,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      a local static variable. PR 43865.
          http://svn.apache.org/viewvc?view=rev&revision=591384
      +1: davi
+     -1: rpluem says: There are two conflicts when merging ssl_engine_vars.c.
+         One is caused by r289444 and the other one is unknown.
 
 PATCHES/ISSUES THAT ARE STALLED