]> 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>
Thu, 17 Mar 2016 19:34:49 +0000 (20:34 +0100)
committerMichael Albinus <michael.albinus@gmx.de>
Thu, 17 Mar 2016 19:34:49 +0000 (20:34 +0100)

Trivial merge