; Merge from origin/emacs-25
commit2cb81869f81a5774134b9c887a0c1b133d89876c
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 19 Mar 2017 19:29:07 +0000 (19 12:29 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 19 Mar 2017 19:29:07 +0000 (19 12:29 -0700)
treeba2ba64a65705a3259a0ecb66098f834e741fb4b
parente6fd84d2d5ca256797ff210c915a2fa773d4d742
parent6102d01ecae664edf192bb25c01622df4518eb49
; Merge from origin/emacs-25

The following commit was skipped:

6102d01 ; Update ChangeLog.2 and AUTHORS files