From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 16 Feb 2018 21:38:32 +0000 (+0200)
Subject: Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs into emacs-26
X-Git-Tag: emacs-26.1-rc1~203
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=aaad1e6;p=emacs.git

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

aaad1e62f3e87873135a465530d6686bed5dc4c3