Merge branch 'debian' into release

Merge in changelog stanza from debian upload targeted at stretch

diff --cc debian/changelog
index 606dada59cb968ac6406bb4f15a12ae7905ff029,8b05d602a8c77f71a09052d9f943d86ace1ab5d2..478f450f7e3e9389b3eed9cf1c5420c83b9e4f3b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,41 -1,9 +1,47 @@@
 +notmuch (0.24.1-1) experimental; urgency=medium
 +
 +  * Restore Xapian wildcard queries to from: and subject:
 +  * Handle empty queries for from: and subject:
 +  * Memory leaks in notmuch show fixed
 +  * Fix bug notmuch dump header generation
 +
 + -- David Bremner <bremner@debian.org>  Sat, 01 Apr 2017 09:17:47 -0300
 +
 +notmuch (0.24-1) experimental; urgency=medium
 +
 +  * New upstream release
 +    - regexp search for from: and subject:
 +    - Emacs interface improvements:
 +      - draft handling
 +      - don't automatically expand application/*
 +      - jump (shortcut) menu for tagging.
 +      - fold long headers when sending
 +    - library improvements
 +      - catch some stray DatabaseModifiedErrors
 +      - make exclude handling non-destructive.
 +
 + -- David Bremner <bremner@debian.org>  Sun, 12 Mar 2017 22:14:25 -0300
 +
 +notmuch (0.24~rc1-1) experimental; urgency=medium
 +
 +  * New upstream release candidate
 +  * upstream release notes
 +  * One library internals fix/optimization for regexp processing.
 +
 + -- David Bremner <bremner@debian.org>  Wed, 08 Mar 2017 08:08:34 -0400
 +
 +notmuch (0.24~rc0-1) experimental; urgency=medium
 +
 +  * New upstream feature release (candidate).
 +
 + -- David Bremner <bremner@debian.org>  Sun, 05 Mar 2017 19:32:08 -0400
 +
+ notmuch (0.23.7-2) unstable; urgency=medium
+ 
+   * Cherry pick 06adc276, fix use after free in libnotmuch4
+ 
+  -- David Bremner <bremner@debian.org>  Sun, 19 Mar 2017 09:38:17 -0300
+ 
  notmuch (0.23.7-1) unstable; urgency=medium
  
    * Move test suite $GNUPGHOME to /tmp to avoid problems with long build paths.