From: Glenn Morris <rgm@gnu.org>
Date: Tue, 20 Aug 2019 16:01:55 +0000 (-0700)
Subject: ; Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~1559
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=989c85e799b7c3a425d3d03f98ecd55d5cf76022;p=emacs.git

; Merge from origin/emacs-26

The following commit was skipped:

190565b Support the new Japanese era name
---

989c85e799b7c3a425d3d03f98ecd55d5cf76022