]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dca240a 9094304)
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