; Merge from origin/emacs-25
commit9b9ab8fb8ed13ae501fb58401ff97518e7736e7e
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 7 Dec 2016 20:39:06 +0000 (7 12:39 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 7 Dec 2016 20:39:06 +0000 (7 12:39 -0800)
tree24241eccc24d9159bded0c06a5a84b25dadbd328
parentc26605861eab8499288dc83e3d80fd0e505b40fc
parent3f2b497cdddcf1f124f1c9f94354d5f457a4070f
; Merge from origin/emacs-25

The following commit was skipped:

3f2b497 * etc/AUTHORS: Regenerate the AUTHORS file