From: David Bremner <david@tethera.net>
Date: Sat, 1 Apr 2017 12:20:44 +0000 (-0300)
Subject: Merge branch 'debian' into release
X-Git-Tag: 0.24.1~1
X-Git-Url: https://git.cworth.org/git?p=notmuch;a=commitdiff_plain;h=a34f30888e7874fba2032a066a7babce1dd3f69f;hp=877cb04914ea30b9b6c4728ed92c8c10f0f4a022

Merge branch 'debian' into release

Merge in changelog stanza from debian upload targeted at stretch
---

diff --git a/debian/changelog b/debian/changelog
index 606dada5..478f450f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,12 @@ notmuch (0.24~rc0-1) experimental; urgency=medium
 
  -- 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.