From: John Wiegley <johnw@newartisans.com>
Date: Fri, 4 Mar 2016 07:53:27 +0000 (-0800)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~2385
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=eab3f9e76b8188b5f99139b220a272fe3f2debaf;p=emacs.git

; Merge from origin/emacs-25

The following commits were skipped:

dc42d0c Use the correct background color when filling nested <divs>
9781dc4 Make <div> in <li> not insert extra newlines
---

eab3f9e76b8188b5f99139b220a272fe3f2debaf