]> git.eshelyaron.com Git - emacs.git/commitdiff
; Merge from origin/emacs-25
authorJohn Wiegley <johnw@newartisans.com>
Fri, 4 Mar 2016 07:53:27 +0000 (23:53 -0800)
committerJohn Wiegley <johnw@newartisans.com>
Fri, 4 Mar 2016 07:53:27 +0000 (23:53 -0800)
The following commits were skipped:

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


Trivial merge