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)
1  2 
lisp/ChangeLog
lisp/shr.el

diff --cc lisp/ChangeLog
Simple merge
diff --cc lisp/shr.el
Simple merge