From: David Bremner <david@tethera.net>
Date: Thu, 1 Jun 2017 10:54:38 +0000 (-0300)
Subject: Merge branch 'release'
X-Git-Tag: 0.25_rc0~58
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=1ec634461ea25d87cc16dbeb1318f8e30a07c9f1;hp=1ec634461ea25d87cc16dbeb1318f8e30a07c9f1

Merge branch 'release'
---