; Merge from origin/emacs-25
commit33a2f93aadc8da93ca5948c6b312eb3e1df25bf1
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 7 Dec 2016 20:41:05 +0000 (7 12:41 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 7 Dec 2016 20:41:05 +0000 (7 12:41 -0800)
tree54f401c83871ceddcacfdd48abb2dbd661d03d46
parent99e20f105aa8a33ca9e70b741400a46447a287af
parenta3487a8121e408ee07fe019270b3bdeaac0ee960
; Merge from origin/emacs-25

The following commit was skipped:

a3487a8 Fix bug#25087