From: W. Trevor King <wking@tremily.us>
Date: Mon, 1 Sep 2014 21:34:37 +0000 (-0700)
Subject: Merge branch 'sendmail-split-addr'
X-Git-Tag: v3.9~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=33c4edb062fb9ccb738e636fde51f0727bedc3d2;p=rss2email.git

Merge branch 'sendmail-split-addr'

* sendmail-split-addr:
  CHANGELOG: Document this branch
  email: Split sender into both sendmail's -F and -f

Signed-off-by: W. Trevor King <wking@tremily.us>
---

33c4edb062fb9ccb738e636fde51f0727bedc3d2
diff --cc CHANGELOG
index 228aa97,012c09a..382e626
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -1,5 -1,5 +1,6 @@@
  v3.9 (unreleased)
+     * Split sender into both sendmail's -F and -f.
 +    * Fix an error with SMTPConnectionError inhertence order ("does not take keyword arguments").
      * Add a new `smtp-ssl-protocol` setting, to select acceptable protocols for SMTP connections.
      * Fix non-compliant User-Agent header for HTTP/1.1.
      * Fix an error in the NoToEmailAddress invocation.