From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 1 Jan 2017 09:02:47 +0000 (-0800)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~969
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bbb683f04aa0960422b12af5ef79679344fac19c;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

ce55382 ; Auto-commit of loaddefs file.
---

bbb683f04aa0960422b12af5ef79679344fac19c