Merge branch 'master' of https://git.gnus.org/gnus
authorLars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Fri, 15 Oct 2010 09:50:44 +0000 (11:50 +0200)
committerLars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Fri, 15 Oct 2010 09:50:44 +0000 (11:50 +0200)
1  2 
lisp/shr.el

diff --cc lisp/shr.el
Simple merge