Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
commitae18cc20f899335cede183f18221b6aae539fd51
authorPhillip Lord <phillip.lord@russet.org.uk>
Thu, 26 Nov 2015 18:09:15 +0000 (26 18:09 +0000)
committerPhillip Lord <phillip.lord@russet.org.uk>
Thu, 26 Nov 2015 18:09:15 +0000 (26 18:09 +0000)
treebcd9c941929a1aa71fed43c167ee2e394f843091
parent13a03c9083a01b30e25a81dd6ecf0da4c7fbd32a
parent6f5f62b3c79485245b1f6d3d9a33d72da92c9e1d
Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25