]> code.delx.au - gnu-emacs/commitdiff
Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
authorMichael Albinus <michael.albinus@gmx.de>
Sun, 28 Feb 2016 10:09:12 +0000 (11:09 +0100)
committerMichael Albinus <michael.albinus@gmx.de>
Sun, 28 Feb 2016 10:09:12 +0000 (11:09 +0100)

Trivial merge