1 Return-Path: <cworth@cworth.org>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 389B0421186
\r
6 for <notmuch@notmuchmail.org>; Wed, 29 Jun 2011 14:23:07 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0.01 tagged_above=-999 required=5
\r
12 tests=[T_MIME_NO_TEXT=0.01] autolearn=disabled
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id Rm2j01Qt9-eX for <notmuch@notmuchmail.org>;
\r
16 Wed, 29 Jun 2011 14:23:06 -0700 (PDT)
\r
17 Received: from arlo.cworth.org (arlo.cworth.org [50.43.72.2])
\r
18 by olra.theworths.org (Postfix) with ESMTP id 985CE429E5F
\r
19 for <notmuch@notmuchmail.org>; Wed, 29 Jun 2011 14:23:06 -0700 (PDT)
\r
20 Received: from yoom.home.cworth.org (localhost [127.0.0.1])
\r
21 by arlo.cworth.org (Postfix) with ESMTP id C7EB229A83D;
\r
22 Wed, 29 Jun 2011 14:23:04 -0700 (PDT)
\r
23 Received: by yoom.home.cworth.org (Postfix, from userid 1000)
\r
24 id B9E032541A8; Wed, 29 Jun 2011 14:23:04 -0700 (PDT)
\r
25 From: Carl Worth <cworth@cworth.org>
\r
26 To: Pieter Praet <pieter@praet.org>, notmuch@notmuchmail.org
\r
27 Subject: Re: [PATCH] test: revert non-intentional changes introduced in
\r
29 In-Reply-To: <1309379027-18048-1-git-send-email-pieter@praet.org>
\r
30 References: <87hb78z8xs.fsf@praet.org>
\r
31 <1309379027-18048-1-git-send-email-pieter@praet.org>
\r
32 User-Agent: Notmuch/0.5 (http://notmuchmail.org) Emacs/23.3.1
\r
34 Date: Wed, 29 Jun 2011 14:23:04 -0700
\r
35 Message-ID: <87zkl049jb.fsf@yoom.home.cworth.org>
\r
37 Content-Type: multipart/signed; boundary="=-=-=";
\r
38 micalg=pgp-sha1; protocol="application/pgp-signature"
\r
39 Cc: Austin Clements <amdragon@mit.edu>
\r
40 X-BeenThere: notmuch@notmuchmail.org
\r
41 X-Mailman-Version: 2.1.13
\r
43 List-Id: "Use and development of the notmuch mail system."
\r
44 <notmuch.notmuchmail.org>
\r
45 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
46 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
47 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
48 List-Post: <mailto:notmuch@notmuchmail.org>
\r
49 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
50 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
51 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
52 X-List-Received-Date: Wed, 29 Jun 2011 21:23:07 -0000
\r
55 Content-Transfer-Encoding: quoted-printable
\r
57 On Wed, 29 Jun 2011 22:23:47 +0200, Pieter Praet <pieter@praet.org> wrote:
\r
58 > eb4cf465 introduces changes which weren't part of the submitted
\r
59 > patch (id:"87liwlip2j.fsf@gmail.com"), presumably made during
\r
60 > resolving merge conflicts.
\r
62 Oops, you caught me.
\r
64 > This commit reverts both changes, as they were clearly accidental.
\r
66 Thanks. This is merged (automatically, so hopefully without errors!) and
\r
72 carl.d.worth@intel.com
\r
75 Content-Type: application/pgp-signature
\r
77 -----BEGIN PGP SIGNATURE-----
\r
78 Version: GnuPG v1.4.11 (GNU/Linux)
\r
80 iEYEARECAAYFAk4Ll7gACgkQ6JDdNq8qSWg7sACgg1VKkuXUycKuTeTmQVDn99CY
\r
81 t5oAn13oM/lDEep5zRKDf6ukYePkWFvP
\r
83 -----END PGP SIGNATURE-----
\r