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

diff --cc lisp/ChangeLog
index de0c45b,edb8dae..97036b8
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,9 -1,11 +1,14 @@@
+ 2010-10-04  Julien Danjou  <julien@danjou.info>
+ 
+       * gnus-util.el (gnus-emacs-completing-read): Mapcar collection to list,
+       for XEmacs.
+ 
  2010-10-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
  
 +      * gnus-salt.el: Remove all gnus-carpal stuff -- it's not useful.
 +
        * nnimap.el (nnimap-open-connection): Allow tls as a synonym for ssl.
 +      (nnimap-close-server): Implement.
  
        * dgnushack.el (iswitchb): Require to shut up the compiler.