Merge branch 'release'

author David Bremner <david@tethera.net>

Sun, 19 Mar 2017 00:02:42 +0000 (21:02 -0300)

committer David Bremner <david@tethera.net>

Sun, 19 Mar 2017 00:02:42 +0000 (21:02 -0300)
author David Bremner <david@tethera.net>
Sun, 19 Mar 2017 00:02:42 +0000 (21:02 -0300)
committer David Bremner <david@tethera.net>
Sun, 19 Mar 2017 00:02:42 +0000 (21:02 -0300)
diff --cc lib/message.cc
Simple merge
diff --cc notmuch-show.c
Simple merge
author	David Bremner <david@tethera.net>
	Sun, 19 Mar 2017 00:02:42 +0000 (21:02 -0300)
committer	David Bremner <david@tethera.net>
	Sun, 19 Mar 2017 00:02:42 +0000 (21:02 -0300)
		1	2
lib/message.cc	patch \|	diff1 \|	diff2 \|	blob \| history
notmuch-show.c	patch \|	diff1 \|	diff2 \|	blob \| history