From: Alan Mackenzie <acm@muc.de>
Date: Tue, 30 May 2017 17:39:40 +0000 (+0000)
Subject: Merge branch 'master' of /home/acm/emacs/emacs.git/master
X-Git-Tag: emacs-26.0.90~521^2~224
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=90e8d65118e1059ea6552c9e5eb59128af390200;p=emacs.git

Merge branch 'master' of /home/acm/emacs/emacs.git/master
---

90e8d65118e1059ea6552c9e5eb59128af390200