From: David Bremner <david@tethera.net>
Date: Thu, 19 Nov 2015 11:33:01 +0000 (-0400)
Subject: Merge branch 'release'
X-Git-Tag: 0.22_rc0~109
X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=edae844efaeda706568850003da116a805b352ee;hp=--cc;p=notmuch

Merge branch 'release'
---

edae844efaeda706568850003da116a805b352ee