From: Michael Albinus <michael.albinus@gmx.de>
Date: Mon, 5 Jun 2017 11:00:07 +0000 (+0200)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
X-Git-Tag: emacs-26.0.90~521^2~170
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9f496c591d457b511a42c0f63e0d2d923cda0247;p=emacs.git

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

9f496c591d457b511a42c0f63e0d2d923cda0247