From: David Bremner <david@tethera.net>
Date: Sun, 15 Jun 2014 18:52:18 +0000 (-0300)
Subject: Merge branch 'release'
X-Git-Tag: address-command-v2~155
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/notmuch.git/commitdiff_plain/9e7bc02530caf94f2eff633129b089d4be26f58a

Merge branch 'release'

still painfully slowly assembling 0.18.1
---

9e7bc02530caf94f2eff633129b089d4be26f58a