From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 26 Sep 2016 20:32:28 +0000 (-0700)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~1546
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2914d52129032c471a6754f4a3961a9dffdc7b18;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

8d0ff83 * etc/AUTHORS: Regenerate the AUTHORS file
---

2914d52129032c471a6754f4a3961a9dffdc7b18