From: David Bremner <bremner@debian.org>
Date: Sun, 3 Jun 2012 14:38:08 +0000 (-0300)
Subject: Merge tag '0.13.2'
X-Git-Tag: 0.14~105
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=5973881b771b4da489a365572152c44e21c329eb;hp=-c

Merge tag '0.13.2'

notmuch 0.13.2 release
---

5973881b771b4da489a365572152c44e21c329eb
diff --combined man/man1/notmuch-show.1
index 3a6c02e7,efd30a02..4aab17ca
--- a/man/man1/notmuch-show.1
+++ b/man/man1/notmuch-show.1
@@@ -1,4 -1,4 +1,4 @@@
- .TH NOTMUCH-SHOW 1 2012-05-25 "Notmuch 0.13.1"
+ .TH NOTMUCH-SHOW 1 2012-06-01 "Notmuch 0.13.2"
  .SH NAME
  notmuch-show \- Show messages matching the given search terms.
  .SH SYNOPSIS
@@@ -130,7 -130,7 +130,7 @@@ Decrypt any MIME encrypted parts found 
  (ie. "multipart/encrypted" parts). Status of the decryption will be
  reported (currently only supported with --format=json) and the
  multipart/encrypted part will be replaced by the decrypted
 -content.
 +content.  Implies --verify.
  .RE
  
  .RS 4