From: David Bremner <david@tethera.net>
Date: Sat, 9 Dec 2017 02:19:06 +0000 (-0400)
Subject: Merge branch 'release'
X-Git-Tag: 0.26_rc0~34
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=040c3236afcf95bead0324a48c2e0b9cd7934993;hp=040c3236afcf95bead0324a48c2e0b9cd7934993;p=notmuch

Merge branch 'release'

Conflicts:
        NEWS

Add in NEWS from point release
---