From: David Bremner <david@tethera.net>
Date: Tue, 26 Aug 2014 00:56:57 +0000 (-0700)
Subject: Merge tag 'debian/0.18.1-2' into wheezy-backports
X-Git-Tag: debian/0.18.1-2_bpo70+1~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=28fda31544f2155bce2ec8d3f6244026af4781c6;p=notmuch.git

Merge tag 'debian/0.18.1-2' into wheezy-backports

uploaded to Debian unstable

Conflicts:
	debian/changelog
---

28fda31544f2155bce2ec8d3f6244026af4781c6
diff --cc debian/changelog
index 5c8d6fba,661aabee..d7af75e8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -54,11 -146,6 +146,12 @@@ notmuch (0.17~rc1-1) experimental; urge
  
   -- David Bremner <bremner@debian.org>  Wed, 20 Nov 2013 19:27:48 -0400
  
 +notmuch (0.16-1~bpo70+1) wheezy-backports; urgency=low
 +
 +  * Rebuild for wheezy-backports.
 +
 + -- David Bremner <bremner@debian.org>  Sun, 01 Sep 2013 19:04:32 -0300
++
  notmuch (0.16-1) unstable; urgency=low
  
    * New upstream feature release