From owner-svn-src-head@FreeBSD.ORG  Sat Jul 20 07:29:20 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 70797680;
 Sat, 20 Jul 2013 07:29:20 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 4930B85B;
 Sat, 20 Jul 2013 07:29:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6K7TKfB048021;
 Sat, 20 Jul 2013 07:29:20 GMT (envelope-from cy@svn.freebsd.org)
Received: (from cy@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6K7TK9f048020;
 Sat, 20 Jul 2013 07:29:20 GMT (envelope-from cy@svn.freebsd.org)
Message-Id: <201307200729.r6K7TK9f048020@svn.freebsd.org>
From: Cy Schubert <cy@FreeBSD.org>
Date: Sat, 20 Jul 2013 07:29:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r253482 - in head: contrib/ipfilter sys/contrib/ipfilter
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 20 Jul 2013 07:29:20 -0000

Author: cy
Date: Sat Jul 20 07:29:19 2013
New Revision: 253482
URL: http://svnweb.freebsd.org/changeset/base/253482

Log:
  As per the developers handbook (5.3.1 step 1), bootstrap svn:mergeinfo on
  the ipfilter directories in the main tree to the last commit made to
  the ipfilter trees in the vendor branches (r253468) which flattened the
  ipfilter vendor trees.
  
  Now that this step is complete, we are free to import new sources into the
  ipfilter vendor trees.
  
  Approved by:	glebius (Mentor)

Modified:
Directory Properties:
  head/contrib/ipfilter/   (props changed)
  head/sys/contrib/ipfilter/   (props changed)