Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs into emacs-26
authorEli Zaretskii <eliz@gnu.org>
Fri, 29 Sep 2017 07:02:33 +0000 (10:02 +0300)
committerEli Zaretskii <eliz@gnu.org>
Fri, 29 Sep 2017 07:02:33 +0000 (10:02 +0300)

Trivial merge