Return-Path: 
 <cvs-return-52433-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org>
X-Original-To: apmail-httpd-cvs-archive@www.apache.org
Delivered-To: apmail-httpd-cvs-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id EC2E0101EA
	for <apmail-httpd-cvs-archive@www.apache.org>;
 Wed, 14 Jan 2015 22:35:00 +0000 (UTC)
Received: (qmail 14000 invoked by uid 500); 14 Jan 2015 22:35:02 -0000
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 13927 invoked by uid 500); 14 Jan 2015 22:35:02 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help: <mailto:cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@httpd.apache.org>
List-Post: <mailto:cvs@httpd.apache.org>
List-Id: <cvs.httpd.apache.org>
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 13916 invoked by uid 99); 14 Jan 2015 22:35:02 -0000
Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Jan 2015 22:35:02 +0000
Received: from hades.apache.org (localhost [127.0.0.1])
	by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id
 7D682AC003F;
	Wed, 14 Jan 2015 22:35:02 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1651856 - /httpd/httpd/branches/2.4.x/CHANGES
Date: Wed, 14 Jan 2015 22:35:02 -0000
To: cvs@httpd.apache.org
From: covener@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20150114223502.7D682AC003F@hades.apache.org>

Author: covener
Date: Wed Jan 14 22:35:02 2015
New Revision: 1651856

URL: http://svn.apache.org/r1651856
Log:

remove bad merge from CHANGES in r1651656


Modified:
    httpd/httpd/branches/2.4.x/CHANGES

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1651856&r1=1651855&r2=1651856&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Wed Jan 14 22:35:02 2015
@@ -44,10 +44,6 @@ Changes with Apache 2.4.11
   *) mod_proxy_fcgi: Remove proxy:balancer:// prefix from SCRIPT_FILENAME
      passed to fastcgi backends. [Eric Covener]
 
-  *) mod_ssl: Add support for extracting subjectAltName entries of type
-     rfc822Name and dNSName into SSL_{CLIENT,SERVER}_SAN_{Email,DNS}_n
-     environment variables. Also addresses PR 57207. [Kaspar Brand]
-
   *) core: Configuration files with long lines and continuation characters
      are not read properly. PR 55910. [Manuel Mausz <manuel-as mausz.at>]