From: David Bremner <david@tethera.net>
Date: Mon, 23 Nov 2015 12:40:40 +0000 (-0400)
Subject: Merge branch 'release'
X-Git-Tag: 0.22_rc0~97
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=bceb6516cee170d3ad4b620826d48e90f05a12b1

Merge branch 'release'

Merge bugfixes applied directly to release
---

bceb6516cee170d3ad4b620826d48e90f05a12b1