From: John Wiegley <johnw@newartisans.com>
Date: Fri, 4 Mar 2016 07:52:26 +0000 (-0800)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~2397
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=15ecb7923af303497eec1e7918f7c70aafd33cde;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

1af5e6e Encode header strings before printing
---

15ecb7923af303497eec1e7918f7c70aafd33cde