From: David Bremner <bremner@debian.org>
Date: Sun, 10 Jul 2011 19:50:09 +0000 (-0300)
Subject: Merge commit '0.6'
X-Git-Tag: 0.7_rc1~16
X-Git-Url: https://git.cworth.org/git?p=notmuch;a=commitdiff_plain;h=22472d9def2f6525a9aac62e6481d8d4fa7db5d0

Merge commit '0.6'
---

22472d9def2f6525a9aac62e6481d8d4fa7db5d0