From: Bastien <bzg@gnu.org>
Date: Mon, 3 Jul 2017 07:09:31 +0000 (+0200)
Subject: Merge branch 'master' into scratch/org-mode-merge
X-Git-Tag: emacs-26.0.90~521^2~10
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1e60ee871ddade4fe091b38fcfa5e4b685695b2b;p=emacs.git

Merge branch 'master' into scratch/org-mode-merge
---

1e60ee871ddade4fe091b38fcfa5e4b685695b2b