Merge branch 'release'

diff --combined man/man1/notmuch-show.1
index 03a99eac307463f2219980e7fb4fc9d211e1d50f,928e03cc5d2c5be67051fbfe1d0dcc0a0641e335..3a6c02e7707f2d0f516d8ebda7dbc1f9d0bc89cd
--- 1/man/man1/notmuch-show.1
--- 2/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