master 78d1092 1/3: Merge from origin/emacs-27

[Glenn Morris]

branch: master
commit 78d1092bcc2d2e77602657bb5ae85ff5ac9f1faf
Merge: 9927582 e12d1fb
Author: Glenn Morris <rgm@gnu.org>
Commit: Glenn Morris <rgm@gnu.org>

    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
---
 ChangeLog.3      | 2 +-
 admin/authors.el | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/ChangeLog.3 b/ChangeLog.3
index 4aa52a7..c8dd40b 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -58779,7 +58779,7 @@
 
        * lisp/net/soap-client.el (soap-type-of): Optimize for Emacs≥26
 
-2018-07-17  Alex  <agrambot@gmail.com>
+2018-07-17  Alexander Gramiak  <agrambot@gmail.com>
 
        Remove menu name from emacs-lisp-mode-map (Bug#27114)
 
diff --git a/admin/authors.el b/admin/authors.el
index 1c06917..cf9cf98 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -212,7 +212,6 @@ files.")
     ("Carlos Pita" "memeplex")
     ("Vinicius Jose Latorre" "viniciusjl")
     ("Gaby Launay" "galaunay")
-    ("Alex Gramiak" "alex")
     ("Dick R. Chiang" "dickmao")
     )
   "Alist of author aliases.