Merge changes made in Gnus trunk.
commit5d2ef6db45580635e3b816852a0318e747fec0d4
authorGnus developers <ding@gnus.org>
Mon, 4 Oct 2010 10:16:57 +0000 (4 10:16 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 4 Oct 2010 10:16:57 +0000 (4 10:16 +0000)
tree6d6b40d3397501e0bc8d0ebd83ad5fb1ab945f7b
parent23179cb9f1f9ebc442e5feef277d264cdf561c70
Merge changes made in Gnus trunk.

gnus-html.el (gnus-html-put-image): Fix resize image code.
shr.el (shr-ensure-paragraph): Fix the non-empty line case.
lisp/gnus/ChangeLog
lisp/gnus/gnus-html.el
lisp/gnus/shr.el