; Merge from origin/emacs-25
commit37b01efe2041999963db839ddf5dc94698e1da61
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 1 Jan 2017 09:02:46 +0000 (1 01:02 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 1 Jan 2017 09:02:46 +0000 (1 01:02 -0800)
tree73e980746ddc55c4285d145769a94b2845cbfcdf
parent4f7a90bf6ce831063d721324e712f8c38e85c678
parentdfc9f114c728c254c19173001c2a5b49207afb9c
; Merge from origin/emacs-25

The following commit was skipped:

dfc9f11 Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emac...