From: Vincent Belaïche <vincentb1@users.sourceforge.net>
Date: Fri, 23 Jun 2017 20:08:10 +0000 (+0200)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
X-Git-Tag: emacs-26.0.90~521^2~11^2~53
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2f943ab169cd6a88474e0e8a67112d3b7a5ff835;p=emacs.git

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

2f943ab169cd6a88474e0e8a67112d3b7a5ff835