]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c1d32a6 1eaf68f)
Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25
authorEli Zaretskii <eliz@gnu.org>
Fri, 5 Feb 2016 21:56:14 +0000 (23:56 +0200)
committerEli Zaretskii <eliz@gnu.org>
Fri, 5 Feb 2016 21:56:14 +0000 (23:56 +0200)

Trivial merge