* ChangeLog.2: Merge from emacs-25.
commit20ccaa63dbf20c0a64e0df360800ee61423252b7
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 19 Mar 2017 20:07:02 +0000 (19 13:07 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 19 Mar 2017 20:09:31 +0000 (19 13:09 -0700)
tree3147380348f0fa2bda854bbe8474c0cc8085f2f8
parentd7f4830215801c0c8d7fee0900ff99159b7a474d
* ChangeLog.2: Merge from emacs-25.
ChangeLog.2