From: Glenn Morris <rgm@gnu.org>
Date: Mon, 31 Dec 2018 00:57:36 +0000 (-0800)
Subject: ; Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~3897
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f23b1db37a816ab88a5970e67d1aaeb7f68ca47c;p=emacs.git

; Merge from origin/emacs-26

The following commits were skipped:

3c83c9e Fix Bug#31704.  Do not merge
de7644d Fix Bug#31704.  Do not merge
---

f23b1db37a816ab88a5970e67d1aaeb7f68ca47c