From: Michael Albinus <michael.albinus@gmx.de>
Date: Sat, 24 Feb 2018 19:48:21 +0000 (+0100)
Subject: Merge branch 'emacs-26' of git.sv.gnu.org:/srv/git/emacs into emacs-26
X-Git-Tag: emacs-26.1-rc1~158
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=57c9f123003dc2769e449af2880917a3a1673428;p=emacs.git

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

57c9f123003dc2769e449af2880917a3a1673428