From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 22 Mar 2016 18:04:36 +0000 (-0700)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~2304
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=656058b790c285aa037a772f752c1446e7423ba2;p=emacs.git

; Merge from origin/emacs-25

The following commits were skipped:

8a35f83 Render empty <ul><li><ul> correctly
d8b2ce5 Ignore invalid base64 encoded embedded images
52ba24b Fix <p> and <div> newlines with or without <li> in shr
---

656058b790c285aa037a772f752c1446e7423ba2