From: W. Trevor King <wking@tremily.us>
Date: Sat, 14 Sep 2013 16:57:12 +0000 (-0700)
Subject: Merge branch 'format-entry-name'
X-Git-Tag: v3.7~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=668438e1845511665a2f4365da0069b1c255553a;p=rss2email.git

Merge branch 'format-entry-name'

* format-entry-name:
  feed: Give defaults for _get_entry_name formatting data
  feed: Convert 'friendly-name' setting to 'name-format'

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

668438e1845511665a2f4365da0069b1c255553a
diff --cc CHANGELOG
index 82fa9a2,2cd8b68..a9a11d6
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -1,5 -1,5 +1,6 @@@
  v3.7 (unreleased)
+     * Convert the `friendly-name` boolean to the new `name-format` setting.  This allow users to customize how the friendly name is constructed.
 +    * Demote guessed encodings logs from 'error' to 'warning'.
  
  v3.6 (2013-09-09)
      * Fix missing port argument for IMAPAuthenticationError.