; Merge from origin/emacs-25
commit2914d52129032c471a6754f4a3961a9dffdc7b18
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 26 Sep 2016 20:32:28 +0000 (26 13:32 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 26 Sep 2016 20:32:28 +0000 (26 13:32 -0700)
tree2d3a5bbac64d7fbd94f3af0774218911a522e61f
parentdcd90f60eb8952d119d97efcef9564ec96def054
parent8d0ff839a5e3d1fbb25b16ad86bf37ccd2f6b291
; Merge from origin/emacs-25

The following commit was skipped:

8d0ff83 * etc/AUTHORS: Regenerate the AUTHORS file