]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9304e6d fef1b30)
; Merge from origin/emacs-25
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 30 Jan 2016 19:41:07 +0000 (11:41 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 30 Jan 2016 19:41:07 +0000 (11:41 -0800)
The following commit was skipped:

fef1b30 Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25


Trivial merge