From: Phillip Lord <phillip.lord@russet.org.uk>
Date: Fri, 15 Jan 2016 22:20:34 +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~167
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/bb0cd3193912032ae11a27016271d4587f876f98

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

bb0cd3193912032ae11a27016271d4587f876f98