]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 549a765 9e5452f)
Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
authorPhillip Lord <phillip.lord@russet.org.uk>
Fri, 15 Jan 2016 22:20:34 +0000 (22:20 +0000)
committerPhillip Lord <phillip.lord@russet.org.uk>
Fri, 15 Jan 2016 22:20:34 +0000 (22:20 +0000)

Trivial merge