Merge branch 'release'

author David Bremner <david@tethera.net>

Sat, 7 Apr 2018 20:43:01 +0000 (17:43 -0300)

committer David Bremner <david@tethera.net>

Sat, 7 Apr 2018 20:43:01 +0000 (17:43 -0300)
author David Bremner <david@tethera.net>
Sat, 7 Apr 2018 20:43:01 +0000 (17:43 -0300)
committer David Bremner <david@tethera.net>
Sat, 7 Apr 2018 20:43:01 +0000 (17:43 -0300)
diff --cc NEWS
Simple merge
diff --cc debian/changelog
Simple merge
diff --cc lib/notmuch.h
Simple merge
author	David Bremner <david@tethera.net>
	Sat, 7 Apr 2018 20:43:01 +0000 (17:43 -0300)
committer	David Bremner <david@tethera.net>
	Sat, 7 Apr 2018 20:43:01 +0000 (17:43 -0300)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
debian/changelog	patch \|	diff1 \|	diff2 \|	blob \| history
lib/notmuch.h	patch \|	diff1 \|	diff2 \|	blob \| history