From: David Bremner <david@tethera.net>
Date: Mon, 17 Jul 2017 12:20:10 +0000 (-0300)
Subject: Merge tag 'debian/0.25_rc0-2'
X-Git-Tag: 0.25_rc1~14
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=4c6e3d83fb2d5d3ce04710d92b97ef6a59a11051

Merge tag 'debian/0.25_rc0-2'

merge 32 bit compilation fix
---

4c6e3d83fb2d5d3ce04710d92b97ef6a59a11051