From: David Bremner <bremner@debian.org>
Date: Tue, 29 May 2012 12:07:31 +0000 (-0300)
Subject: Merge branch 'release'
X-Git-Tag: 0.14~107
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=d99f15d7ee38d606a2b3b5bd34f1e6c787b3b8a2

Merge branch 'release'
---

d99f15d7ee38d606a2b3b5bd34f1e6c787b3b8a2