From: Glenn Morris <rgm@gnu.org>
Date: Mon, 23 Mar 2020 16:46:39 +0000 (-0700)
Subject: Merge from origin/emacs-27
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~16^2~6955
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d5cfc4ac8bd25ec43864af4b8d10fff643fb47bd;p=emacs.git

Merge from origin/emacs-27

bed04c502c Use correct registry name for windows-1251 charset
1aa1529301 ERC: Update maintainer address
---

d5cfc4ac8bd25ec43864af4b8d10fff643fb47bd