From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 7 Dec 2016 20:41:05 +0000 (-0800)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~1166
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e22eabd5bcd6a840b4f4ff91e37a64c606c9751d;p=emacs.git

; Merge from origin/emacs-25

The following commits were skipped:

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

e22eabd5bcd6a840b4f4ff91e37a64c606c9751d