(no commit message)

diff --git a/22/f6325d2a2b802bed2b26193479dd5596de0d4a b/22/f6325d2a2b802bed2b26193479dd5596de0d4a
new file mode 100644 (file)
index 0000000..d03d096
--- /dev/null
+++ b/22/f6325d2a2b802bed2b26193479dd5596de0d4a
@@ -0,0 +1,60 @@
+Return-Path: <jrollins@finestructure.net>\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 B3ABD429E29\r
+       for <notmuch@notmuchmail.org>; Sun, 13 Nov 2011 11:15:34 -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 iTpEjTBcG9-u for <notmuch@notmuchmail.org>;\r
+       Sun, 13 Nov 2011 11:15:32 -0800 (PST)\r
+Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu\r
+       [131.215.239.19])\r
+       by olra.theworths.org (Postfix) with ESMTP id B0D06431FB6\r
+       for <notmuch@notmuchmail.org>; Sun, 13 Nov 2011 11:15:32 -0800 (PST)\r
+Received: from fire-doxen.imss.caltech.edu (localhost [127.0.0.1])\r
+       by fire-doxen-postvirus (Postfix) with ESMTP id 49BF02E50D96\r
+       for <notmuch@notmuchmail.org>; Sun, 13 Nov 2011 11:15:30 -0800 (PST)\r
+X-Spam-Scanned: at Caltech-IMSS on fire-doxen by amavisd-new\r
+Received: from finestructure.net (cpe-76-174-136-149.socal.res.rr.com\r
+       [76.174.136.149]) (Authenticated sender: jrollins)\r
+       by fire-doxen-submit (Postfix) with ESMTP id 9E5152E50D65\r
+       for <notmuch@notmuchmail.org>; Sun, 13 Nov 2011 11:15:28 -0800 (PST)\r
+Received: by finestructure.net (Postfix, from userid 1000)\r
+       id 3DEC2B57; Sun, 13 Nov 2011 11:15:28 -0800 (PST)\r
+From: Jameson Graef Rollins <jrollins@finestructure.net>\r
+To: Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: \r
+Date: Sun, 13 Nov 2011 11:15:19 -0800\r
+Message-Id: <1321211721-7608-1-git-send-email-jrollins@finestructure.net>\r
+X-Mailer: git-send-email 1.7.7.1\r
+In-Reply-To: <87ipmo69hi.fsf@zancas.localnet>\r
+References: <87ipmo69hi.fsf@zancas.localnet>\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: Sun, 13 Nov 2011 19:15:35 -0000\r
+\r
+So this is incredibly confusing to me, but git is supposedly doing\r
+something clever that allows these patches to apply in my repo but not\r
+in a clean one.\r
+\r
+In any event, I'm resending the patches after being applied to my\r
+master, which should resolve any conflict and allow them to apply.\r
+\r
+jamie.\r