Merge changes from emacs-24; up to 2012-04-26T02:03:19Z!ueno@unixuser.org

[gnu-emacs] / lisp / gnus / ChangeLog

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index b86b4a76e3083ab04a056593454fa21ac369f978..bce4e4a18005e352e69a13a02d511f077f7fafb8 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,13 @@
+2012-06-10  Toke Høiland-Jørgensen  <toke@toke.dk>  (tiny change)
+
+       * nnmaildir.el (nnmaildir-request-expire-articles): Ensure that `time'
+       is an integer to avoid later problems.
+
+2012-06-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * shr.el: Add a iso-8859-1 cookie to make stuff work under other
+       locales.
+
 2012-04-14  Wolfgang Jenkner  <wjenkner@inode.at>
 
        * gnus-agent.el (gnus-agent-retrieve-headers): Recalculate the range of