Merge remote branch 'origin/no-gnus'

diff --cc lisp/ChangeLog
index 37855a7,d795909..e8eb826
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,40 -1,8 +1,45 @@@
 +2012-03-22  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 +
 +      * nnimap.el (nnimap-fetch-partial-articles): Minor doc string fixup.
 +
 +2012-03-22  Katsumi Yamaoka  <yamaoka@jpl.org>
 +
 +      * gnus-msg.el (gnus-summary-resend-message-insert-gcc): Assume that
 +      gnus-gcc-self-resent-messages may be a group parameter.
 +      (gnus-summary-resend-message): Don't encode encoded words in header
 +      when Gcc'ing resent message.
 +
 +2012-03-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 +
 +      * shr.el (shr-insert): Treat non-breaking space just like normal
 +      space.  This seems to produce more pleasing results.
 +      (shr-insert): Only insert a blank line if we're starting from an image.
 +      (shr-tag-br): Allow <br> to end lines or to make a single blank line.
 +      (shr-ensure-paragraph): Consider lines with white space to be blank.
 +
 +2012-03-15  Elias Pipping  <pipping@lavabit.com>
 +
 +      * Makefile.in: Respect DESTDIR.
 +
 +2012-03-14  Christopher Schmidt  <christopher@ch.ristopher.com>
 +
 +      * gnus-msg.el (gnus-inews-do-gcc): Add gnus-gcc-pre-body-encode-hook
 +      and gnus-gcc-post-body-encode-hook.
 +
 +2012-03-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 +
 +      * gnus-group.el (gnus-group-expire-articles-1): Don't try to expire
 +      messages that don't exist.
 +
 +      * gnus-sum.el (gnus-summary-expire-articles): Ditto.
 +
 +2012-03-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 +
+ 2012-03-22  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+ 
+       * auth-source.el (auth-source-netrc-create): Quote tokens that contain
+       "#" to avoid having them interpreted as comments.
+ 
  2012-03-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
  
        * shr.el (shr-insert): Update the text state properly to avoid
@@@ -131,24 -98,11 +136,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