From: Alan Mackenzie <acm@muc.de>
Date: Wed, 30 Mar 2016 16:53:36 +0000 (+0000)
Subject: Merge branch 'emacs-25' of /home/acm/emacs/emacs.git/emacs-25 into emacs-25
X-Git-Tag: emacs-25.0.93~89
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/ed19f207449c43f7f08285ada87ae7a46c61c8d1

Merge branch 'emacs-25' of /home/acm/emacs/emacs.git/emacs-25 into emacs-25
---

ed19f207449c43f7f08285ada87ae7a46c61c8d1