Merge remote-tracking branch 'origin/no-gnus'

diff --cc lisp/ChangeLog
index c708c7f,d631b8b..69fd5ae
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,8 -1,13 +1,18 @@@
 +2012-02-19  Vida Gábor  <vidagabor@gmail.com>  (tiny change)
 +
 +      * gnus-demon.el (gnus-demon-init): Don't multiply time twice.
 +      Reported by Peter Münster.
 +
+ 2012-02-20  Lars Ingebrigtsen  <larsi@gnus.org>
+ 
+       * nnimap.el (nnimap-log-command): Add the IMAP address to the log
+       buffer.  Suggested by Herbert Valerio Riedel.
+ 
+ 2012-02-19  Vida Gábor  <vidagabor@gmail.com>  (tiny change)
+ 
+       * gnus-demon.el (gnus-demon-init): Don't multiply time twice.
+       Reported by Peter Münster.
+ 
  2012-02-18  Lars Ingebrigtsen  <larsi@gnus.org>
  
        * shr.el (shr-image-fetched): Make sure we really kill the right
@@@ -12,24 -17,11 +22,24 @@@
  
        * gnus-start.el (gnus-1): Avoid duplicate entries.
  
- 2012-02-16  Lars Ingebrigtsen  <larsi@gnus.org>
- 
-       * mm-decode.el (mm-dissect-singlepart): Guess what the type of
-       application/octet-stream parts really is.
- 
-       * gnus-sum.el (gnus-propagate-marks): Remove.
- 
  2012-02-15  Lars Ingebrigtsen  <larsi@gnus.org>
  
 -      * shr.el (shr-remove-trailing-whitespace): Really delete the padding on
 -      too-wide lines.
 +      * imap.el: Remove.
 +
 +      * nntp.el (nntp-coding-system-for-read): Remove.
 +      (nntp-coding-system-for-write): Ditto.
 +      (nntp-open-connection): Just use `binary' directly.
 +
 +      * gnus-start.el (gnus-clean-old-newsrc): Delete `unexist' from pre-Ma
 +      Gnus 0.3.
 +
++2012-02-16  Lars Ingebrigtsen  <larsi@gnus.org>
++
++      * mm-decode.el (mm-dissect-singlepart): Guess what the type of
++      application/octet-stream parts really is.
++
++      * gnus-sum.el (gnus-propagate-marks): Remove.
+ 
  2012-02-15  Paul Eggert  <eggert@cs.ucla.edu>
  
        * shr.el (shr-rescale-image): Undo previous change; see

diff --cc lisp/nnimap.el
Simple merge