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

; Merge from origin/emacs-25

The following commits were skipped:

5e92111 Bump Emacs version to 25.2 RC1
a51f11d ; Update ChangeLog.2 and AUTHORS files
---

c4fca5cee27e3bf399ad23bf42317bffcc80f160