merge from no gnus
authorLars Ingebrigtsen <larsi@gnus.org>
Mon, 13 Feb 2012 02:44:26 +0000 (03:44 +0100)
committerLars Ingebrigtsen <larsi@gnus.org>
Mon, 13 Feb 2012 02:44:26 +0000 (03:44 +0100)
commit331faf118601a6693115666283894b37a5ac847f
tree71d6e75fadbfee7656a3a6aadd827d1c93223d7e
parent15a65996727617efe97de72cb1e694d4cd59aa67
parent99f4e6416f9880185a5b8999ec2c81c1d4eba71c
merge from no gnus
lisp/ChangeLog
lisp/shr.el