Merge branch 'release'

author David Bremner <david@tethera.net>

Sat, 1 Apr 2017 12:36:34 +0000 (09:36 -0300)

committer David Bremner <david@tethera.net>

Sat, 1 Apr 2017 12:36:34 +0000 (09:36 -0300)
author David Bremner <david@tethera.net>
Sat, 1 Apr 2017 12:36:34 +0000 (09:36 -0300)
committer David Bremner <david@tethera.net>
Sat, 1 Apr 2017 12:36:34 +0000 (09:36 -0300)
diff --cc notmuch-client.h
Simple merge
diff --cc notmuch-dump.c
Simple merge
diff --cc test/T240-dump-restore.sh
Simple merge
author	David Bremner <david@tethera.net>
	Sat, 1 Apr 2017 12:36:34 +0000 (09:36 -0300)
committer	David Bremner <david@tethera.net>
	Sat, 1 Apr 2017 12:36:34 +0000 (09:36 -0300)
		1	2
notmuch-client.h	patch \|	diff1 \|	diff2 \|	blob \| history
notmuch-dump.c	patch \|	diff1 \|	diff2 \|	blob \| history
test/T240-dump-restore.sh	patch \|	diff1 \|	diff2 \|	blob \| history