From: David Bremner <david@tethera.net>
Date: Thu, 1 Dec 2016 12:57:48 +0000 (-0400)
Subject: Merge branch 'release'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=71012e81098dce71cbd69479ecdee375a24db79c;p=notmuch.git

Merge branch 'release'
---

71012e81098dce71cbd69479ecdee375a24db79c