Return-Path: <cworth@cworth.org>
X-Original-To: notmuch@notmuchmail.org
Delivered-To: notmuch@notmuchmail.org
Received: from localhost (localhost [127.0.0.1])
	by olra.theworths.org (Postfix) with ESMTP id 389B0421186
	for <notmuch@notmuchmail.org>; Wed, 29 Jun 2011 14:23:07 -0700 (PDT)
X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
X-Spam-Flag: NO
X-Spam-Score: 0.01
X-Spam-Level: 
X-Spam-Status: No, score=0.01 tagged_above=-999 required=5
	tests=[T_MIME_NO_TEXT=0.01] autolearn=disabled
Received: from olra.theworths.org ([127.0.0.1])
	by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id Rm2j01Qt9-eX for <notmuch@notmuchmail.org>;
	Wed, 29 Jun 2011 14:23:06 -0700 (PDT)
Received: from arlo.cworth.org (arlo.cworth.org [50.43.72.2])
	by olra.theworths.org (Postfix) with ESMTP id 985CE429E5F
	for <notmuch@notmuchmail.org>; Wed, 29 Jun 2011 14:23:06 -0700 (PDT)
Received: from yoom.home.cworth.org (localhost [127.0.0.1])
	by arlo.cworth.org (Postfix) with ESMTP id C7EB229A83D;
	Wed, 29 Jun 2011 14:23:04 -0700 (PDT)
Received: by yoom.home.cworth.org (Postfix, from userid 1000)
	id B9E032541A8; Wed, 29 Jun 2011 14:23:04 -0700 (PDT)
From: Carl Worth <cworth@cworth.org>
To: Pieter Praet <pieter@praet.org>, notmuch@notmuchmail.org
Subject: Re: [PATCH] test: revert non-intentional changes introduced in
	eb4cf465
In-Reply-To: <1309379027-18048-1-git-send-email-pieter@praet.org>
References: <87hb78z8xs.fsf@praet.org>
	<1309379027-18048-1-git-send-email-pieter@praet.org>
User-Agent: Notmuch/0.5 (http://notmuchmail.org) Emacs/23.3.1
	(i486-pc-linux-gnu)
Date: Wed, 29 Jun 2011 14:23:04 -0700
Message-ID: <87zkl049jb.fsf@yoom.home.cworth.org>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
	micalg=pgp-sha1; protocol="application/pgp-signature"
Cc: Austin Clements <amdragon@mit.edu>
X-BeenThere: notmuch@notmuchmail.org
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: "Use and development of the notmuch mail system."
	<notmuch.notmuchmail.org>
List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
List-Archive: <http://notmuchmail.org/pipermail/notmuch>
List-Post: <mailto:notmuch@notmuchmail.org>
List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Jun 2011 21:23:07 -0000

--=-=-=
Content-Transfer-Encoding: quoted-printable

On Wed, 29 Jun 2011 22:23:47 +0200, Pieter Praet <pieter@praet.org> wrote:
> eb4cf465 introduces changes which weren't part of the submitted
> patch (id:"87liwlip2j.fsf@gmail.com"), presumably made during
> resolving merge conflicts.

Oops, you caught me.

> This commit reverts both changes, as they were clearly accidental.

Thanks. This is merged (automatically, so hopefully without errors!) and
pushed out.

=2DCarl

=2D-=20
carl.d.worth@intel.com

--=-=-=
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iEYEARECAAYFAk4Ll7gACgkQ6JDdNq8qSWg7sACgg1VKkuXUycKuTeTmQVDn99CY
t5oAn13oM/lDEep5zRKDf6ukYePkWFvP
=Ljdo
-----END PGP SIGNATURE-----
--=-=-=--