From: David Bremner <bremner@debian.org>
Date: Thu, 15 Mar 2012 02:01:38 +0000 (-0300)
Subject: Merge branch 'release'
X-Git-Tag: 0.13_rc1~158
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=4d17a34286dc67fd434a9c8ca3518bf878ecf78b

Merge branch 'release'
---

4d17a34286dc67fd434a9c8ca3518bf878ecf78b