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

uploaded to Debian unstable

Conflicts:
	debian/changelog

diff --cc debian/changelog
index 5c8d6fbaad7a37e84b29a5be0ef3e12921b6280b,661aabeecefe43fbc0618f8882abe15457711307..d7af75e8c6b8cccba84da729818641706642a9d5
--- 1/debian/changelog
--- 2/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