From: Glenn Morris <rgm@gnu.org>
Date: Mon, 3 Aug 2020 15:31:15 +0000 (-0700)
Subject: Merge from origin/emacs-27
X-Git-Tag: emacs-28.0.90~6848
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=78d1092bcc2d2e77602657bb5ae85ff5ac9f1faf;p=emacs.git

Merge from origin/emacs-27

e12d1fbc15 ; ChangeLog.3 and etc/AUTHORS fixes
748f0d4bc6 * admin/authors.el (authors-aliases): Remove a faulty regexp.

# Conflicts:
#	etc/AUTHORS
---

78d1092bcc2d2e77602657bb5ae85ff5ac9f1faf