Merge branch 'master' of https://git.gnus.org/gnus
authorLars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Wed, 1 Sep 2010 15:06:07 +0000 (17:06 +0200)
committerLars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Wed, 1 Sep 2010 15:06:07 +0000 (17:06 +0200)
1  2 
lisp/ChangeLog
lisp/gnus-html.el

diff --cc lisp/ChangeLog
Simple merge
Simple merge