From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 1 Jun 2018 14:10:46 +0000 (+0300)
Subject: Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs into emacs-26
X-Git-Tag: emacs-26.1.90~425
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=21f2247;p=emacs.git

Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs into emacs-26
---

21f2247cf49d2332dd3f6d696318c9c65fd26c83