diff options
| author | Bill Wohler <wohler@newt.com> | 2012-12-08 17:19:00 -0800 |
|---|---|---|
| committer | Bill Wohler <wohler@newt.com> | 2012-12-08 17:19:00 -0800 |
| commit | e1b489df7af8f7034f8c2ef275b786e93a39df31 (patch) | |
| tree | 2edc9307185e2c77b98fe75f6d7eb0476c58c7e3 /lisp/mh-e | |
| parent | ce974958f93ffa2e1bd01b4dd85dcb8ec1395787 (diff) | |
| parent | c6c08d3f8fe4d2c9e588189e46d60a30ef3e8d20 (diff) | |
| download | emacs-e1b489df7af8f7034f8c2ef275b786e93a39df31.tar.gz | |
Merge from trunk; up to 2012-12-09T01:04:43Z!rgm@gnu.org.
Diffstat (limited to 'lisp/mh-e')
| -rw-r--r-- | lisp/mh-e/mh-e.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el index 3871d727b3a..25784d0ebcd 100644 --- a/lisp/mh-e/mh-e.el +++ b/lisp/mh-e/mh-e.el @@ -2663,7 +2663,7 @@ of citations entirely, choose \"None\"." "X-Mail-from:" ; fastmail.fm "X-MAIL-INFO:" ; NetZero "X-Mailer_" - "X-MailFlowPolicy:" ; Cicso ironport (http://www.ironport.com) + "X-MailFlowPolicy:" ; Cisco Email Security (formerly IronPort; http://www.ironport.com) "X-Mailing-List:" ; Unknown mailing list managers "X-MailingID:" "X-Mailman-Approved-At:" ; Mailman mailing list manager @@ -2743,7 +2743,7 @@ of citations entirely, choose \"None\"." "X-Scanned-By:" "X-Sender-ID:" ; Google+ "X-Sender:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ - "X-Sendergroup:" ; Cicso ironport (http://www.ironport.com) + "X-Sendergroup:" ; Cisco Email Security (formerly IronPort; http://www.ironport.com) "X-Server-Date:" "X-Server-Uuid:" "X-Service-Code:" |