From: Ruediger Pluem <rpluem@apache.org>
Date: Thu, 15 Nov 2007 14:44:26 +0000 (+0000)
Subject: * Add a comment
X-Git-Tag: 2.2.7~235
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dc0dc66be7e50ffb338b7a65592299f07da26149;p=thirdparty%2Fapache%2Fhttpd.git

* 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 d19f1d5ec5b..f356408ee94 100644
--- 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