Merge branch 'release'
authorDavid Bremner <david@tethera.net>
Sun, 31 Dec 2017 13:26:13 +0000 (09:26 -0400)
committerDavid Bremner <david@tethera.net>
Sun, 31 Dec 2017 13:26:13 +0000 (09:26 -0400)
commit99407db25cbd44f915fb33708c497bc375ff63de
tree2b357c6cb01ac5ec9ce2e262077184c9f7a7b075
parente5e252de5560fee386bd46f8f279c800b953c667
parenteff029de4a8782ccfe20e26814c740a271cb5285
Merge branch 'release'

Conflicts:
        doc/man1/notmuch-reply.rst
doc/man1/notmuch-show.rst

Conflicts taken from release (dkg's doc changes)
doc/man1/notmuch-reply.rst
doc/man1/notmuch-show.rst