]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
authorMichael Albinus <michael.albinus@gmx.de>
Mon, 4 Jan 2016 22:28:23 +0000 (23:28 +0100)
committerMichael Albinus <michael.albinus@gmx.de>
Mon, 4 Jan 2016 22:28:23 +0000 (23:28 +0100)

Trivial merge