; Merge from origin/emacs-25
commit32b46fc82f1275d8e0c86340546db366dea48c8c
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 7 Dec 2016 20:39:08 +0000 (7 12:39 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 7 Dec 2016 20:39:08 +0000 (7 12:39 -0800)
treeb4cf7ad204c611d20db93f846a0b4aebadd06d31
parentfd6632b397316146397dd478a858f0b9a90efeed
parent46065291fa0807a10180b958285f5d375cf05914
; Merge from origin/emacs-25

The following commit was skipped:

4606529 ; ChangeLog.2 update