From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 30 Jan 2016 19:41:07 +0000 (-0800)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~2793
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e6d575316a42946aac6d83c9587f09afd1a59d98;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

fef1b30 Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
---

e6d575316a42946aac6d83c9587f09afd1a59d98