]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Add a comment.
authorGraham Leggett <minfrin@apache.org>
Sat, 27 Feb 2010 18:59:45 +0000 (18:59 +0000)
committerGraham Leggett <minfrin@apache.org>
Sat, 27 Feb 2010 18:59:45 +0000 (18:59 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@917016 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index fae545f91d831b4270157d25aad0c4896f5b341e..b7cdfca931f89c11930f40057840b986d7412b25 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -93,6 +93,8 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     [also requested on apache@freebsd.org]
 
     +1: pgollucci, sf, jorton, trawick
+    minfrin: The trunk patch currently conflicts with v2.2, is someone able
+    to take a look?
 
   * mod_negotiation: Do not loose query string after content negotiation
       Trunk version of patch: