From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 9 Feb 2016 22:23:10 +0000 (-0800)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~2680
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8fa67e959bcc835c359981aae01f0dad3213451a;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

d7933ff ; Auto-commit of ChangeLog files.
---

8fa67e959bcc835c359981aae01f0dad3213451a