]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e5754f6 a574955)
Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25
authorEli Zaretskii <eliz@gnu.org>
Mon, 23 Nov 2015 17:41:32 +0000 (19:41 +0200)
committerEli Zaretskii <eliz@gnu.org>
Mon, 23 Nov 2015 17:41:32 +0000 (19:41 +0200)

Trivial merge