Merge branch '0.3.x' immediately after the 0.3.1 release

[notmuch] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 2e7049438a12530aa12299c5b18b5382a55ff74a..66589c18f64747798d479994382e5d8c70dfd7a1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+notmuch (0.3.1) unstable; urgency=low
+
+  * Fix an infinite loop in "notmuch reply"
+  * Fix a potential SEGV in "notmuch search"
+  * emacs: Fix calculations for line wrapping in the "notmuch" view.
+  * emacs: Fix Fcc support to prompt to create a directory if necessary
+
+ -- Carl Worth <cworth@debian.org>  Tue, 27 Apr 2010 17:02:07 -0700
+
 notmuch (0.3) unstable; urgency=low
 
   * User-configurable tags for new messages
@@ -22,7 +31,7 @@ notmuch (0.3) unstable; urgency=low
   * emacs: New keybinding (M-Ret) to open all collapsed messages in a thread
   * libnotmuch1: Provide a new NOTMUCH_SORT_UNSORTED value for queries
 
- -- Carl Worth <cworth@cworth.org>  Tue, 27 Apr 2010 02:07:29 -0700
+ -- Carl Worth <cworth@debian.org>  Tue, 27 Apr 2010 02:07:29 -0700
 
 notmuch (0.2) unstable; urgency=low