From: David Bremner <bremner@debian.org>
Date: Mon, 21 Nov 2011 11:26:11 +0000 (-0400)
Subject: Merge branch 'release'
X-Git-Tag: 0.11_rc1~118
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=bdf38b5e0fb9674d482c439c1cdb077cd16cdc96;hp=-c

Merge branch 'release'
---

bdf38b5e0fb9674d482c439c1cdb077cd16cdc96