From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 19 Mar 2017 19:34:03 +0000 (-0700)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~531
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=640335361ccc36945836b5e7de0dbbf984b332e8;p=emacs.git

; Merge from origin/emacs-25

The following commits were skipped:

fe91ff2 ; Update ldef-boot.el for Emacs 25.1 release
4210210 ; Update ChangeLog.2 and AUTHORS files
---

640335361ccc36945836b5e7de0dbbf984b332e8