Merge branch 'release'

diff --combined debian/changelog
index f5df0d75c7fb6c8a67b93cc46d1b3e0801515097,ea155a4ea5238c118844f0399de7dd577760967a..78358d76a00ee67a782f693a60d070fded71bb8c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,9 +1,9 @@@
+ notmuch (0.24.2-2) unstable; urgency=medium
+ 
+   * rebuild for unstable
+ 
+  -- David Bremner <bremner@debian.org>  Sun, 02 Jul 2017 12:48:46 -0300
+ 
  notmuch (0.24.2-1) experimental; urgency=medium
  
    * Fix dump output to not include tags when not asked for
@@@ -43,12 -49,6 +49,12 @@@ notmuch (0.24~rc0-1) experimental; urge
  
   -- David Bremner <bremner@debian.org>  Sun, 05 Mar 2017 19:32:08 -0400
  
 +notmuch (0.23.7-3) unstable; urgency=medium
 +
 +  * Cherry pick fixes to dump header from 0.24.1
 +
 + -- David Bremner <bremner@debian.org>  Sat, 01 Apr 2017 21:09:36 -0300
 +
  notmuch (0.23.7-2) unstable; urgency=medium
  
    * Cherry pick 06adc276, fix use after free in libnotmuch4