]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25
authorEli Zaretskii <eliz@gnu.org>
Mon, 19 Dec 2016 17:59:00 +0000 (19:59 +0200)
committerEli Zaretskii <eliz@gnu.org>
Mon, 19 Dec 2016 17:59:00 +0000 (19:59 +0200)

Trivial merge