; Merge from origin/emacs-25
commite22eabd5bcd6a840b4f4ff91e37a64c606c9751d
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)
tree19ce0dc5b3b9a2db7aa1b854026517c7d6fb92e2
parente676b7b80b5c5bd65b7a9f28fdac631cf78c22db
parentc49198967ae90f97e315dde5a4d1b234200f13df
; Merge from origin/emacs-25

The following commits were skipped:

c491989 Port to Sun C 5.14
95eb641 Fix mail-combine-fields