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

notmuch Debian 0.12-1 upload (same as 0.12 + debian changelog fix)

Conflicts:
	debian/changelog

diff --cc debian/changelog
index 3cb2ad5a3b8c7f510bfc7cc9a451a8e81b11104f,d0eec37de2986409eda7a75fd17c00a92b0e23e8..026871dd1264b5ea60afbf4c87402ddfab642ee6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,29 +1,35 @@@
+ notmuch (0.12-1) unstable; urgency=low
+ 
+   * New upstream release
+     - Python 3.2 support
+     - GMime 2.6 support
+     - Many updates to emacs interface (see /usr/share/doc/notmuch/NEWS)
+     - Optionally ignore some files/directories within mail hierarchy
+ 
+  -- David Bremner <bremner@debian.org>  Tue, 20 Mar 2012 18:45:22 -0300
+ 
+ notmuch (0.12~rc2-1) experimental; urgency=low
+ 
+   * Upstream pre-release
+   * New bug fixes since ~rc1
+     - fix for uninitialized variable
+     - fix for python bindings type signatures
+ 
+  -- David Bremner <bremner@debian.org>  Sun, 18 Mar 2012 08:10:35 -0300
+ 
+ notmuch (0.12~rc1-1) experimental; urgency=low
+ 
+   * Upstream pre-release.
+   * Bump standards version to 3.9.3; no changes.
+ 
+  -- David Bremner <bremner@debian.org>  Thu, 01 Mar 2012 07:51:45 -0400
+ 
 +notmuch (0.11.1-1~bpo60+1) squeeze-backports; urgency=low
 +
 +  * Rebuild for squeeze-backports.
 +
 + -- David Bremner <bremner@debian.org>  Wed, 15 Feb 2012 19:18:44 -0400
 +
  notmuch (0.11.1-1) unstable; urgency=low
  
    * Upstream bugfix release