From owner-svn-src-stable@FreeBSD.ORG  Mon May 26 16:01:46 2014
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 39FCC588;
 Mon, 26 May 2014 16:01:46 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2664C22DB;
 Mon, 26 May 2014 16:01:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4QG1k50016854;
 Mon, 26 May 2014 16:01:46 GMT
 (envelope-from gshapiro@svn.freebsd.org)
Received: (from gshapiro@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4QG1kO8016852;
 Mon, 26 May 2014 16:01:46 GMT
 (envelope-from gshapiro@svn.freebsd.org)
Message-Id: <201405261601.s4QG1kO8016852@svn.freebsd.org>
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Date: Mon, 26 May 2014 16:01:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject: svn commit: r266704 - stable/7/release/doc/en_US.ISO8859-1/relnotes
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 26 May 2014 16:01:46 -0000

Author: gshapiro
Date: Mon May 26 16:01:45 2014
New Revision: 266704
URL: http://svnweb.freebsd.org/changeset/base/266704

Log:
  Note merge for sendmail 8.14.9.

Modified:
  stable/7/release/doc/en_US.ISO8859-1/relnotes/article.sgml

Modified: stable/7/release/doc/en_US.ISO8859-1/relnotes/article.sgml
==============================================================================
--- stable/7/release/doc/en_US.ISO8859-1/relnotes/article.sgml	Mon May 26 16:00:35 2014	(r266703)
+++ stable/7/release/doc/en_US.ISO8859-1/relnotes/article.sgml	Mon May 26 16:01:45 2014	(r266704)
@@ -660,8 +660,8 @@
       <para><application>OpenSSL</application> has been updated to
 	version 0.9.8q.</para>
 
-      <para revision="249871"><application>sendmail</application> has
-	been updated to version 8.14.8.</para>
+      <para revision="266694"><application>sendmail</application> has
+	been updated to version 8.14.9.</para>
 
       <para>The &man.tcsh.1; program has been updated to version
 	6.17.00.</para>