From owner-svn-src-stable@FreeBSD.ORG  Wed Jan 27 15:40:08 2010
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DB958106566B;
	Wed, 27 Jan 2010 15:40:08 +0000 (UTC)
	(envelope-from gavin@FreeBSD.org)
Received: from mail-gw2.york.ac.uk (mail-gw2.york.ac.uk [144.32.128.247])
	by mx1.freebsd.org (Postfix) with ESMTP id 6BC588FC0A;
	Wed, 27 Jan 2010 15:40:08 +0000 (UTC)
Received: from mail-gw7.york.ac.uk (mail-gw7.york.ac.uk [144.32.129.30])
	by mail-gw2.york.ac.uk (8.13.6/8.13.6) with ESMTP id o0RFe1CP006479;
	Wed, 27 Jan 2010 15:40:01 GMT
Received: from buffy-128.york.ac.uk ([144.32.128.160] helo=buffy.york.ac.uk)
	by mail-gw7.york.ac.uk with esmtps (TLSv1:AES256-SHA:256) (Exim 4.68)
	(envelope-from <gavin@FreeBSD.org>)
	id 1Na9zt-0001d0-JL; Wed, 27 Jan 2010 15:40:01 +0000
Received: from buffy.york.ac.uk (localhost [127.0.0.1])
	by buffy.york.ac.uk (8.14.3/8.14.3) with ESMTP id o0RFe1qE008887;
	Wed, 27 Jan 2010 15:40:01 GMT (envelope-from gavin@FreeBSD.org)
Received: (from ga9@localhost)
	by buffy.york.ac.uk (8.14.3/8.14.3/Submit) id o0RFe1OY008886;
	Wed, 27 Jan 2010 15:40:01 GMT (envelope-from gavin@FreeBSD.org)
X-Authentication-Warning: buffy.york.ac.uk: ga9 set sender to
	gavin@FreeBSD.org using -f
From: Gavin Atkinson <gavin@FreeBSD.org>
To: src-committers@FreeBSD.org
In-Reply-To: <201001271536.o0RFaJnN054904@svn.freebsd.org>
References: <201001271536.o0RFaJnN054904@svn.freebsd.org>
Content-Type: text/plain; charset="ASCII"
Content-Transfer-Encoding: quoted-printable
Date: Wed, 27 Jan 2010 15:40:00 +0000
Message-ID: <1264606800.7054.8.camel@buffy.york.ac.uk>
Mime-Version: 1.0
X-Mailer: Evolution 2.28.1 FreeBSD GNOME Team Port 
X-York-MailScanner: Found to be clean
X-York-MailScanner-From: gavin@freebsd.org
Cc: svn-src-stable@FreeBSD.org, svn-src-all@FreeBSD.org,
	svn-src-stable-8@FreeBSD.org
Subject: Re: svn commit: r203074 - stable/8/usr.bin/calendar/calendars
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Wed, 27 Jan 2010 15:40:09 -0000

On Wed, 2010-01-27 at 15:36 +0000, Gavin Atkinson wrote:
> Author: gavin
> Date: Wed Jan 27 15:36:19 2010
> New Revision: 203074
> URL: http://svn.freebsd.org/changeset/base/203074
>=20
> Log:
>   Merge r200318 from head:  add myself to calendar.freebsd.

Sorry, forgot:

Approved by: ed (mentor, implicit)

> Modified:
>   stable/8/usr.bin/calendar/calendars/calendar.freebsd   (contents, props=
 changed)
> Directory Properties:
>   stable/8/usr.bin/calendar/   (props changed)

This mergeinfo issue appears to be related to a mismerge of r196252:
I've left it as it was.

Gavin