From: David Bremner <david@tethera.net>
Date: Sun, 19 Mar 2017 00:02:42 +0000 (-0300)
Subject: Merge branch 'release'
X-Git-Tag: 0.25_rc0~100
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=a8a270522231b186493ecd97d56a1343382d51d8

Merge branch 'release'

Merge in memory fixes
---

a8a270522231b186493ecd97d56a1343382d51d8