Merge from origin/emacs-24
commitcbd447e1cdbbebcd2a04144194138bb7936dea9d
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 26 Feb 2015 06:52:01 +0000 (25 22:52 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 26 Feb 2015 06:52:01 +0000 (25 22:52 -0800)
tree1d21d7e8d22c758fe17f2b61241200ea757b1171
parent4d36e5246e3d182b84f5d776e730a81e03fff06a
parentb75358e98f3bdae9bc74010cfd9e09716b7ae02c
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