From: David Bremner <david@tethera.net>
Date: Wed, 8 Mar 2017 12:31:51 +0000 (-0400)
Subject: Merge branch 'release'
X-Git-Tag: 0.25_rc0~139
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=4e872c64e1ab63f35edfd4d0a6500cc24b62fe0d;hp=4e872c64e1ab63f35edfd4d0a6500cc24b62fe0d

Merge branch 'release'

new release candidate, with regexp fix
---