From: David Bremner <david@tethera.net>
Date: Sat, 14 Jun 2014 02:03:49 +0000 (-0300)
Subject: Merge branch 'release'
X-Git-Tag: address-command-v2~156
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/notmuch.git/commitdiff_plain/44e6c52c76199f707b344b3303710a03201bee40

Merge branch 'release'

Merge in a few more commits towards 0.18.1
---

44e6c52c76199f707b344b3303710a03201bee40