From: David Bremner <david@tethera.net>
Date: Sun, 8 Jan 2017 12:42:26 +0000 (-0400)
Subject: Merge branch 'release'
X-Git-Tag: 0.24_rc0~52
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=b15b96f846dcfabbd0c7f43e741573cfd14ab3c8

Merge branch 'release'

These are the (tentative) changes for 0.23.5
---

b15b96f846dcfabbd0c7f43e741573cfd14ab3c8