From: David Bremner <david@tethera.net>
Date: Tue, 4 Jul 2017 00:35:05 +0000 (-0300)
Subject: Merge branch 'release'
X-Git-Tag: 0.25_rc0~44
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=0aba694c11846f76cfa64470d10a50cec8e43bd5

Merge branch 'release'
---

0aba694c11846f76cfa64470d10a50cec8e43bd5