From: John Wiegley <johnw@newartisans.com>
Date: Tue, 12 Jan 2016 06:48:10 +0000 (-0800)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~2819^2~8
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2d7f4d99f715a3b32bb2873be6e9b4e7e1dad1da;p=emacs.git

; Merge from origin/emacs-25

The following commits were skipped:

31a97ac Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
4e62197 Introduce check-expensive tests.
9fb185a shr-tag-video bug fix
---

2d7f4d99f715a3b32bb2873be6e9b4e7e1dad1da