From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 26 Feb 2015 06:52:01 +0000 (-0800)
Subject: Merge from origin/emacs-24
X-Git-Tag: emacs-25.0.90~2564^2~283
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cbd447e1cdbbebcd2a04144194138bb7936dea9d;p=emacs.git

Merge from origin/emacs-24

The following commits were skipped:

b75358e Merge remote-tracking branch 'origin/emacs-24' into emacs-24
c96c93f [Backport] lisp/gnus/message.el (message-smtpmail-send-it): Make non-standard mail header separators work with smtpmail
972282f [Backport] lisp/gnus/message.el (message-smtpmail-send-it): Make non-standard mail header separators work with smtpmail
---

cbd447e1cdbbebcd2a04144194138bb7936dea9d