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

diff --cc lisp/ChangeLog
index cd8ee82,ee98698..6bb6997
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,9 -1,8 +1,12 @@@
 +2012-02-20  Lars Ingebrigtsen  <larsi@gnus.org>
 +
 +      * gnus-start.el (gnus-clean-old-newsrc): Allow a FORCE parameter.
 +
  2012-02-20  Lars Ingebrigtsen  <larsi@gnus.org>
  
+       * gnus-sum.el (gnus-summary-insert-old-articles): Fix the syntax for
+       the default in `read-string' (bug#10757).
+ 
        * gnus-msg.el (gnus-group-post-news): Don't bug out on `C-u a' on
        topics (bug#10843).
  
@@@ -26,24 -25,11 +29,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/gnus-sum.el
Simple merge