Merge from trunk.

1 files changed, 30 insertions, 0 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 8cb53de85fa..5f635e59cdf 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,33 @@
+2012-11-08  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-art.el (gnus-article-browse-html-parts): Always replace charset
+        in meta tag with the one the part specifies in its header.
+
+2012-11-02  Stephen Eglen  <S.J.Eglen@damtp.cam.ac.uk>
+
+        * gnus-dired.el (gnus-dired-attach): Attach to last used message buffer
+        by default.
+
+2012-11-02  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        New UIDL implementation.
+
+        * mail-source.el (mail-sources, mail-source-keyword-map):
+        Add :leave as a pop3 keyword.
+        (mail-source-fetch-pop): Bind pop3-leave-mail-on-server.
+
+        * pop3.el (pop3-leave-mail-on-server): Allow number.
+        (pop3-uidl-file, pop3-uidl-file-backup): New user options.
+        (pop3-movemail): Add UIDL support.
+        (pop3-send-streaming-command): Take a list of mail numbers instead of
+        the number of mails.
+        (pop3-write-to-file): Add X-UIDL header.
+        (pop3-uidl-stat, pop3-uidl-dele, pop3-uidl-load, pop3-uidl-save)
+        (pop3-uidl-add-xheader): New functions.
+
+        * message.el (message-ignored-resent-headers):
+        Add X-Content-Length and X-UIDL headers.
+
 2012-10-23  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * nndiary.el (nndiary-request-create-group-functions)