From: David Bremner <david@tethera.net>
Date: Sat, 4 Feb 2012 19:05:56 +0000 (+1900)
Subject: Re: [PATCH v6 3/3] post-merge fixes
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=5e9a4ee9eb178f7e4a8e32cf166678335ecfbc20;p=notmuch-archives.git

Re: [PATCH v6 3/3] post-merge fixes
---

diff --git a/85/2c4469dc0216d6d0b561821912b001effee62b b/85/2c4469dc0216d6d0b561821912b001effee62b
new file mode 100644
index 000000000..b7f3aeed8
--- /dev/null
+++ b/85/2c4469dc0216d6d0b561821912b001effee62b
@@ -0,0 +1,64 @@
+Return-Path: <bremner@unb.ca>
+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 13155431FBC
+	for <notmuch@notmuchmail.org>; Sat,  4 Feb 2012 11:06:12 -0800 (PST)
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
+X-Spam-Flag: NO
+X-Spam-Score: -2.3
+X-Spam-Level: 
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5
+	tests=[RCVD_IN_DNSWL_MED=-2.3] 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 K+UkLUPyaaf8 for <notmuch@notmuchmail.org>;
+	Sat,  4 Feb 2012 11:06:11 -0800 (PST)
+Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21])
+	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
+	(No client certificate requested)
+	by olra.theworths.org (Postfix) with ESMTPS id 21A77431FAF
+	for <notmuch@notmuchmail.org>; Sat,  4 Feb 2012 11:06:11 -0800 (PST)
+Received: from rocinante.cs.unb.ca ([70.151.3.3]) (authenticated bits=0)
+	by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id q14J63C6016184
+	(version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO);
+	Sat, 4 Feb 2012 15:06:07 -0400
+Received: from bremner by rocinante.cs.unb.ca with local (Exim 4.77)
+	(envelope-from <bremner@unb.ca>)
+	id 1Rtkvt-0004TQ-0E; Sat, 04 Feb 2012 14:05:57 -0500
+From: David Bremner <david@tethera.net>
+To: Pieter Praet <pieter@praet.org>
+Subject: Re: [PATCH v6 3/3] post-merge fixes
+In-Reply-To: <1328264649-27346-3-git-send-email-pieter@praet.org>
+References: <87r4yc2p3y.fsf@praet.org>
+	<1328264649-27346-3-git-send-email-pieter@praet.org>
+User-Agent: Notmuch/0.11.1 (http://notmuchmail.org) Emacs/23.3.1
+	(x86_64-pc-linux-gnu)
+Date: Sat, 04 Feb 2012 14:05:56 -0500
+Message-ID: <87haz6s9kb.fsf@rocinante.cs.unb.ca>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=us-ascii
+Cc: Notmuch Mail <notmuch@notmuchmail.org>
+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: Sat, 04 Feb 2012 19:06:12 -0000
+
+On Fri,  3 Feb 2012 11:24:09 +0100, Pieter Praet <pieter@praet.org> wrote:
+> ---
+>  emacs/notmuch-mua.el |    2 +-
+>  test/emacs           |    2 +-
+>  2 files changed, 2 insertions(+), 2 deletions(-)
+
+split into two commits and pushed,
+
+d