lisp/ChangeLog: Add missing entries

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0438aad..5bfe294 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -8,8 +8,16 @@
        * gnus-int.el (gnus-warp-to-article): Limit registry warping to real
        groups (bug#11641).
 
+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.
+
        * mm-decode.el (mm-display-part): Dissect archives when hitting `RET'
        on a handle.