Merge tag 'debian/0.11.1-1' into squeeze-backports

notmuch Debian 0.11.1-1 upload (same as 0.11.1)

Conflicts:
	debian/changelog

diff --cc debian/changelog
index d954e8a255569c376d55bbc14d80c1e76d48ab9f,fad531adda25b87b9f8138117ef3a1a101227f93..e82e4dce40d4140067f64baa7ad07162c1082f63
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,17 @@@
+ notmuch (0.11.1-1) unstable; urgency=low
+ 
+   * Upstream bugfix release
+     - Fix error handling bug in python bindings
+     - Fix vulnerability in emacs reply handling
+ 
+  -- David Bremner <bremner@debian.org>  Fri, 03 Feb 2012 08:35:41 -0400
+ 
 +notmuch (0.11-1~bpo60+1) squeeze-backports; urgency=low
 +
 +  * Rebuild for squeeze-backports.
 +
 + -- David Bremner <bremner@debian.org>  Fri, 27 Jan 2012 18:05:01 -0400
 +
  notmuch (0.11-1) unstable; urgency=low
  
    * New upstream release.