Merge branch 'dad/mml2015-epg-use-from-to-sign' of http://www.baby-gnu.org/~nebu...

Conflicts:
	lisp/ChangeLog

diff --cc lisp/ChangeLog
index 0e1651f,eb0e5c6..abf636b
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,7 -1,8 +1,12 @@@
 +2010-11-17  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 +
 +      * shr.el (shr-put-image): Break lines when inserting big pictures.
 +
+ 2010-11-17  Daniel Dehennin  <daniel.dehennin@baby-gnu.org>
+ 
+       * mml2015.el (mml2015-epg-encrypt): Fix two cons with missing
+       sender, thanks Katsumi Yamaoka.
+ 
  2010-11-17  Andrew Cohen  <cohen@andy.bu.edu>
  
        * nnir.el (nnir-run-imap): Reverse the article list for each group