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

; Merge from origin/emacs-25

The following commit was skipped:

6102d01 ; Update ChangeLog.2 and AUTHORS files
---

2cb81869f81a5774134b9c887a0c1b133d89876c