This is a rebase to current master that resolves some trivial ordering merge conflicts in notmuch-client.h.
Subject: [PATCH v3 0/4] First step of 'show' rewrite
Date: Fri, 9 Dec 2011 14:54:24 -0500
Cc:
From: Austin Clements
This is a rebase to current master that resolves some trivial ordering merge conflicts in notmuch-client.h.