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

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