From: Yann Ylavic <ylavic@apache.org>
Date: Fri, 9 Sep 2016 22:26:25 +0000 (+0000)
Subject: Vote.
X-Git-Tag: 2.4.24~257
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c332fdea063a6d301e967dffb6afa29830208126;p=thirdparty%2Fapache%2Fhttpd.git

Vote.

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

diff --git a/STATUS b/STATUS
index 837ea0e1a54..9d89179c431 100644
--- a/STATUS
+++ b/STATUS
@@ -160,9 +160,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: http://home.apache.org/~jchampion/patches/2.4.x-autoconf-cleanup.patch
                   (combines both patches and corrects for differences in the
                   AC_CONFIG_FILES list)
-     +1: jchampion
-     ylavic: some conflicts with r1753315 in 2.4.x's configure.in.
-     jchampion: added a 2.4.x backport patch.
+     +1: jchampion, ylavic
 
   *) mod_ssl: Fix quick renegotiation (OptRenegotiaton) with no intermediate
      in the client certificate chain.  PR 55786.