Merge changes made in No Gnus
commitb4543a2894f8d74cb01e4b353f8d6ebb5ae7bf3b
authorGnus developers <ding@gnus.org>
Sun, 10 Jun 2012 22:16:03 +0000 (10 22:16 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 10 Jun 2012 22:16:03 +0000 (10 22:16 +0000)
treebd5bcac1b83dd4ee894a93adcd4a3bc8e6ee7108
parent166bc0c84e48bc9874abc2b215047a0705d83c1d
Merge changes made in No Gnus

2012-06-10  Toke Hoiland-Jorgensen <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.
lisp/gnus/ChangeLog
lisp/gnus/nnmaildir.el
lisp/gnus/shr.el