]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c93ae7a f6497c6)
Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25
authorEli Zaretskii <eliz@gnu.org>
Fri, 8 Apr 2016 13:55:34 +0000 (16:55 +0300)
committerEli Zaretskii <eliz@gnu.org>
Fri, 8 Apr 2016 13:55:34 +0000 (16:55 +0300)

Trivial merge