From: David Bremner <david@tethera.net>
Date: Sat, 13 May 2017 11:51:10 +0000 (-0300)
Subject: Merge branch 'release'
X-Git-Tag: 0.25_rc0~70
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=523d2b50fcaae90cbe09975c1f1bc652ff521ec6

Merge branch 'release'

Emacs bug fix from Mark
---

523d2b50fcaae90cbe09975c1f1bc652ff521ec6