Merge branch 'master' of https://git.gnus.org/gnus

diff --combined lisp/ChangeLog
index ac500fa,93228a1..715c738
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,7 -1,6 +1,7 @@@
  2010-10-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
  
        * shr.el (shr-tag-blockquote): Ensure paragraph after quote, too.
 +      (shr-get-image-data): Ensure against the cache file missing.
  
        * nnimap.el (nnimap-finish-retrieve-group-infos): Message while waiting
        for data.
@@@ -13,6 -12,9 +13,9 @@@
  
  2010-10-04  Julien Danjou  <julien@danjou.info>
  
+       * mml-smime.el (mml-smime-openssl-encrypt-query): Fix choices.
+       (mml-smime-openssl-sign-query): Fix gnus-completing-read call.
+ 
        * gravatar.el (gravatar-retrieved): Kill buffer when gravatar has been
        retrieved.