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

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

5ca1888fe670aee7febd4d42665d7372ab2ffebc