]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 25e461c 223b3f0)
Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25
authorEli Zaretskii <eliz@gnu.org>
Sun, 13 Dec 2015 19:52:03 +0000 (21:52 +0200)
committerEli Zaretskii <eliz@gnu.org>
Sun, 13 Dec 2015 19:52:03 +0000 (21:52 +0200)

Trivial merge