]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 13a03c9 6f5f62b)
Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
authorPhillip Lord <phillip.lord@russet.org.uk>
Thu, 26 Nov 2015 18:09:15 +0000 (18:09 +0000)
committerPhillip Lord <phillip.lord@russet.org.uk>
Thu, 26 Nov 2015 18:09:15 +0000 (18:09 +0000)

Trivial merge