; Merge from origin/emacs-25
commitbbb683f04aa0960422b12af5ef79679344fac19c
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 1 Jan 2017 09:02:47 +0000 (1 01:02 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 1 Jan 2017 09:02:47 +0000 (1 01:02 -0800)
tree2ce695d1512d61e55318d1d2ad775b3c0073b4f7
parent9bec2fb3c19968a673f761c55057c4dbc9d907be
parentce5538248e29ba2e4db531192a92e7c334de92da
; Merge from origin/emacs-25

The following commit was skipped:

ce55382 ; Auto-commit of loaddefs file.