From: David Bremner <david@tethera.net>
Date: Wed, 28 May 2014 12:50:32 +0000 (-0300)
Subject: Merge branch 'release'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=94064a6ba2f67005352915dc01c6eb0e19b761f9;p=notmuch.git

Merge branch 'release'

A point release is slowly being built on branch release. Merge those
changes into master.
---

94064a6ba2f67005352915dc01c6eb0e19b761f9