From: David Bremner <bremner@debian.org>
Date: Mon, 21 Nov 2011 11:26:11 +0000 (-0400)
Subject: Merge branch 'release'
X-Git-Tag: 0.11_rc1~118
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=bdf38b5e0fb9674d482c439c1cdb077cd16cdc96;hp=cef4075404e093c91e6135802430a46ae97462ed

Merge branch 'release'
---

diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index feb517b5..85fc3876 100644
--- a/bindings/python/notmuch/version.py
+++ b/bindings/python/notmuch/version.py
@@ -1,2 +1,2 @@
 # this file should be kept in sync with ../../../version
-__VERSION__ = '0.10~rc1'
+__VERSION__ = '0.10~rc2'
diff --git a/debian/changelog b/debian/changelog
index 9e70015b..c4f96ede 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+notmuch (0.10~rc2-1) experimental; urgency=low
+
+  * New upstream release candidate
+    - includes patch to avoid long unix domain socket paths in tests
+
+ -- David Bremner <bremner@debian.org>  Sat, 19 Nov 2011 08:21:39 -0400
+
 notmuch (0.10~rc1-1) experimental; urgency=low
 
   * New upstream release candidate.
diff --git a/notmuch.1 b/notmuch.1
index 57612b98..bb20c220 100644
--- a/notmuch.1
+++ b/notmuch.1
@@ -16,7 +16,7 @@
 .\" along with this program.  If not, see http://www.gnu.org/licenses/ .
 .\"
 .\" Author: Carl Worth <cworth@cworth.org>
-.TH NOTMUCH 1 2011-11-21 "Notmuch 0.10"
+.TH NOTMUCH 1 2011-11-17 "Notmuch 0.10~rc2"
 .SH NAME
 notmuch \- thread-based email index, search, and tagging
 .SH SYNOPSIS
diff --git a/version b/version
index bdc34446..7eee7719 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.10~rc1
+0.10~rc2