Merge tag '0.20'

notmuch 0.20 release

4 files changed, 14 insertions, 8 deletions

diff --git a/NEWS b/NEWS
index eeaf0d4b..463b6b62 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Notmuch 0.20 (UNRELEASED)
+Notmuch 0.20 (2015-05-31)
 =========================
 
 Command-Line Interface
@@ -15,11 +15,6 @@ Path to gpg is now configurable
   On systems with multiple versions of gpg, you can tell
   notmuch which one to use by setting `crypto.gpg_path`
 
-New command, `notmuch-emacs-mua`
-
-  This new wrapper script is intended to be a drop in replacement for
-  mutt to compose and send mail using `notmuch-emacs`
-
 Emacs
 -----
 
diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index 0377dae1..55014249 100644
--- a/bindings/python/notmuch/version.py
+++ b/bindings/python/notmuch/version.py
@@ -1,3 +1,3 @@
 # this file should be kept in sync with ../../../version
-__VERSION__ = '0.20~rc2'
+__VERSION__ = '0.20'
 SOVERSION = '4'
diff --git a/debian/changelog b/debian/changelog
index b0d035ca..9300dddc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+notmuch (0.20-1) unstable; urgency=medium
+
+  * New upstream release
+    - new mimetype search prefix
+    - improvements to emacs, vim, and mutt front-ends
+    - undeprecate single message mboxes.
+    - reduced noise on stderr from the library
+    - improved API for notmuch_query_search_{messages, thread}
+
+ -- David Bremner <bremner@debian.org>  Sun, 31 May 2015 11:21:14 +0200
+
 notmuch (0.20~rc2-1) experimental; urgency=medium
 
   * New upstream release candidate.
diff --git a/version b/version
index fa9b0efe..9f4eca25 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.20~rc2
+0.20