From: David Bremner <david@tethera.net>
Date: Fri, 7 Oct 2016 01:56:46 +0000 (-0300)
Subject: Merge branch 'release'
X-Git-Tag: 0.24_rc0~131
X-Git-Url: https://git.cworth.org/git?p=notmuch;a=commitdiff_plain;h=ba8fba3d6aa37b1c7698137f6d577309335981ae

Merge branch 'release'
---

ba8fba3d6aa37b1c7698137f6d577309335981ae