From: David Bremner <david@tethera.net>
Date: Thu, 17 Aug 2017 00:44:43 +0000 (-0300)
Subject: Merge branch 'release'
X-Git-Tag: 0.26_rc0~204
X-Git-Url: https://git.cworth.org/git?p=notmuch;a=commitdiff_plain;h=9836a8f42bf83d57950f670e69d72854ee5e063b

Merge branch 'release'

merge in debian-only changes
---

9836a8f42bf83d57950f670e69d72854ee5e063b