From: Phillip Lord <phillip.lord@russet.org.uk>
Date: Thu, 26 Nov 2015 18:09:15 +0000 (+0000)
Subject: Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
X-Git-Tag: emacs-25.0.90~640
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ae18cc20f899335cede183f18221b6aae539fd51;p=emacs.git

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

ae18cc20f899335cede183f18221b6aae539fd51