]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: da05685 26e7624)
Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25
authorEli Zaretskii <eliz@gnu.org>
Fri, 13 Nov 2015 20:03:12 +0000 (22:03 +0200)
committerEli Zaretskii <eliz@gnu.org>
Fri, 13 Nov 2015 20:03:12 +0000 (22:03 +0200)

Trivial merge