From: David Bremner <bremner@debian.org>
Date: Tue, 29 May 2012 12:07:31 +0000 (-0300)
Subject: Merge branch 'release'
X-Git-Tag: 0.14~107
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=d99f15d7ee38d606a2b3b5bd34f1e6c787b3b8a2;hp=-c;p=obsolete%2Fnotmuch-old

Merge branch 'release'
---

d99f15d7ee38d606a2b3b5bd34f1e6c787b3b8a2
diff --combined man/man1/notmuch-show.1
index 03a99eac,928e03cc..3a6c02e7
--- a/man/man1/notmuch-show.1
+++ b/man/man1/notmuch-show.1
@@@ -1,4 -1,4 +1,4 @@@
- .TH NOTMUCH-SHOW 1 2012-05-15 "Notmuch 0.13"
+ .TH NOTMUCH-SHOW 1 2012-05-25 "Notmuch 0.13.1"
  .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