From: David Bremner <david@tethera.net>
Date: Tue, 2 Jun 2015 04:37:59 +0000 (+0200)
Subject: Merge branch 'release'
X-Git-Tag: 0.21_rc0~102
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=243d7e30dcd80041760307d8d0d2a1839f36eca2

Merge branch 'release'

20.1 plus NEWS fixup
---

243d7e30dcd80041760307d8d0d2a1839f36eca2