Merge remote branch 'origin/no-gnus'
authorLars Magne Ingebrigtsen <larsi@gnus.org>
Tue, 10 Apr 2012 20:58:33 +0000 (22:58 +0200)
committerLars Magne Ingebrigtsen <larsi@gnus.org>
Tue, 10 Apr 2012 20:58:33 +0000 (22:58 +0200)
1  2 
lisp/ChangeLog
lisp/gnus-art.el

diff --cc lisp/ChangeLog
  
        * 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
Simple merge