From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 12 Oct 2017 20:44:17 +0000 (-0700)
Subject: ; Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~6248
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a346d5bd25acee99bb94f9b785507d4e4ccb554b;p=emacs.git

; Merge from origin/emacs-26

The following commits were skipped:

906224eba1 ; * Update ldefs-boot.el
872108f709 Bump Emacs version to 26.0.90
419a371f8b Update authors.el
3f37086958 * admin/authors.el (authors-aliases): Additions.
---

a346d5bd25acee99bb94f9b785507d4e4ccb554b