From: Glenn Morris <rgm@gnu.org>
Date: Mon, 11 Oct 2021 15:04:57 +0000 (-0700)
Subject: ; Merge from origin/emacs-28
X-Git-Tag: emacs-29.0.90~3671^2~611
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cc8c114b168e52dfb5a6091372c8a057b81c2f95;p=emacs.git

; Merge from origin/emacs-28

The following commit was skipped:

31d60488ac Backport: Add ERC version to protocol log
---

cc8c114b168e52dfb5a6091372c8a057b81c2f95