From: Michael R. Mauger <michael@mauger.com>
Date: Mon, 7 Aug 2017 00:58:08 +0000 (-0400)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
X-Git-Tag: emacs-26.0.90~517
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6e2c0929bac8d3896d0472222cd3e6b77cb24c35;p=emacs.git

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

6e2c0929bac8d3896d0472222cd3e6b77cb24c35