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

diff --combined lisp/ChangeLog
index 8528a7b,93318be..721a7d7
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,5 -1,7 +1,7 @@@
  2011-03-15  Lars Magne Ingebrigtsen  <larsi@gnus.org>
  
+       * nnimap.el (nnimap-open-connection-1): Allow `network-only', too.
+ 
        * gssapi.el: New file separated out from imap.el to provide a general
        Kerberos 5 connection facility for Emacs.
  
@@@ -47,11 -49,6 +49,11 @@@
  
        * message.el (message-yank-original): Use cond instead of CL case.
  
 +2011-03-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * auth-source.el (auth-source-netrc-create): Use usual format for the
 +      default in prompts.
 +
  2011-03-14  Katsumi Yamaoka  <yamaoka@jpl.org>
  
        * lpath.el: Fbind read-char-choice for XEmacs.